http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/rcfile_createas1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/rcfile_createas1.q.out 
b/ql/src/test/results/clientpositive/llap/rcfile_createas1.q.out
index 58fc47d..f6f47bb 100644
--- a/ql/src/test/results/clientpositive/llap/rcfile_createas1.q.out
+++ b/ql/src/test/results/clientpositive/llap/rcfile_createas1.q.out
@@ -46,12 +46,22 @@ PREHOOK: query: EXPLAIN
         SELECT key, value, PMOD(HASH(key), 50) as part
         FROM rcfile_createas1a
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@rcfile_createas1a
+PREHOOK: Input: default@rcfile_createas1a@ds=1
+PREHOOK: Input: default@rcfile_createas1a@ds=2
+PREHOOK: Output: database:default
+PREHOOK: Output: default@rcfile_createas1b
 POSTHOOK: query: EXPLAIN
     CREATE TABLE rcfile_createas1b
     STORED AS RCFILE AS 
         SELECT key, value, PMOD(HASH(key), 50) as part
         FROM rcfile_createas1a
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@rcfile_createas1a
+POSTHOOK: Input: default@rcfile_createas1a@ds=1
+POSTHOOK: Input: default@rcfile_createas1a@ds=2
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@rcfile_createas1b
 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/163caed7/ql/src/test/results/clientpositive/llap/rcfile_merge2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/rcfile_merge2.q.out 
b/ql/src/test/results/clientpositive/llap/rcfile_merge2.q.out
index 51a16b8..8cf96f0 100644
--- a/ql/src/test/results/clientpositive/llap/rcfile_merge2.q.out
+++ b/ql/src/test/results/clientpositive/llap/rcfile_merge2.q.out
@@ -19,11 +19,14 @@ PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE 
rcfile_merge2a PARTITION (one='1'
         PMOD(HASH(value), 10) as three
     FROM src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@rcfile_merge2a@one=1
 POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE rcfile_merge2a PARTITION 
(one='1', two, three)
     SELECT key, value, PMOD(HASH(key), 10) as two, 
         PMOD(HASH(value), 10) as three
     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/163caed7/ql/src/test/results/clientpositive/llap/rcfile_merge3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/rcfile_merge3.q.out 
b/ql/src/test/results/clientpositive/llap/rcfile_merge3.q.out
index 3374cc6..da615a9 100644
--- a/ql/src/test/results/clientpositive/llap/rcfile_merge3.q.out
+++ b/ql/src/test/results/clientpositive/llap/rcfile_merge3.q.out
@@ -51,9 +51,17 @@ POSTHOOK: Lineage: rcfile_merge3a_n0 PARTITION(ds=2).value 
SIMPLE [(src)src.Fiel
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE rcfile_merge3b_n0
     SELECT key, value FROM rcfile_merge3a_n0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@rcfile_merge3a_n0
+PREHOOK: Input: default@rcfile_merge3a_n0@ds=1
+PREHOOK: Input: default@rcfile_merge3a_n0@ds=2
+PREHOOK: Output: default@rcfile_merge3b_n0
 POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE rcfile_merge3b_n0
     SELECT key, value FROM rcfile_merge3a_n0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@rcfile_merge3a_n0
+POSTHOOK: Input: default@rcfile_merge3a_n0@ds=1
+POSTHOOK: Input: default@rcfile_merge3a_n0@ds=2
+POSTHOOK: Output: default@rcfile_merge3b_n0
 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/163caed7/ql/src/test/results/clientpositive/llap/rcfile_merge4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/rcfile_merge4.q.out 
b/ql/src/test/results/clientpositive/llap/rcfile_merge4.q.out
index 3fe587b..41902b6 100644
--- a/ql/src/test/results/clientpositive/llap/rcfile_merge4.q.out
+++ b/ql/src/test/results/clientpositive/llap/rcfile_merge4.q.out
@@ -51,9 +51,17 @@ POSTHOOK: Lineage: rcfile_merge3a PARTITION(ds=2).value 
SIMPLE [(src)src.FieldSc
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE rcfile_merge3b
     SELECT key, value FROM rcfile_merge3a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@rcfile_merge3a
+PREHOOK: Input: default@rcfile_merge3a@ds=1
+PREHOOK: Input: default@rcfile_merge3a@ds=2
+PREHOOK: Output: default@rcfile_merge3b
 POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE rcfile_merge3b
     SELECT key, value FROM rcfile_merge3a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@rcfile_merge3a
+POSTHOOK: Input: default@rcfile_merge3a@ds=1
+POSTHOOK: Input: default@rcfile_merge3a@ds=2
+POSTHOOK: Output: default@rcfile_merge3b
 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/163caed7/ql/src/test/results/clientpositive/llap/reduce_deduplicate.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/reduce_deduplicate.q.out 
b/ql/src/test/results/clientpositive/llap/reduce_deduplicate.q.out
index 9eb235a..9a190fa 100644
--- a/ql/src/test/results/clientpositive/llap/reduce_deduplicate.q.out
+++ b/ql/src/test/results/clientpositive/llap/reduce_deduplicate.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: explain extended
 insert overwrite table bucket5_1
 select * from src cluster by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@bucket5_1
 POSTHOOK: query: explain extended
 insert overwrite table bucket5_1
 select * from src cluster by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@bucket5_1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -289,6 +293,8 @@ select s2.* from
 )s
 )s2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@complex_tbl_2
+PREHOOK: Output: default@complex_tbl_1@ds=2010-03-29
 POSTHOOK: query: explain extended
 insert overwrite table complex_tbl_1 partition (ds='2010-03-29')
 select s2.* from
@@ -305,6 +311,8 @@ select s2.* from
 )s
 )s2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@complex_tbl_2
+POSTHOOK: Output: default@complex_tbl_1@ds=2010-03-29
 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/163caed7/ql/src/test/results/clientpositive/llap/reduce_deduplicate_distinct.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/reduce_deduplicate_distinct.q.out 
b/ql/src/test/results/clientpositive/llap/reduce_deduplicate_distinct.q.out
index 758a2e5..8d04800 100644
--- a/ql/src/test/results/clientpositive/llap/reduce_deduplicate_distinct.q.out
+++ b/ql/src/test/results/clientpositive/llap/reduce_deduplicate_distinct.q.out
@@ -21,10 +21,14 @@ PREHOOK: query: explain select id,count(distinct 
key),count(distinct name)
 from count_distinct_test
 group by id
 PREHOOK: type: QUERY
+PREHOOK: Input: default@count_distinct_test
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select id,count(distinct key),count(distinct name)
 from count_distinct_test
 group by id
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@count_distinct_test
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -99,10 +103,14 @@ PREHOOK: query: explain select id,count(Distinct 
key),count(Distinct name)
 from (select id,key,name from count_distinct_test group by id,key,name)m
 group by id
 PREHOOK: type: QUERY
+PREHOOK: Input: default@count_distinct_test
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select id,count(Distinct key),count(Distinct name)
 from (select id,key,name from count_distinct_test group by id,key,name)m
 group by id
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@count_distinct_test
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -196,10 +204,14 @@ PREHOOK: query: explain select id,count(Distinct 
name),count(Distinct key)
 from (select id,key,name from count_distinct_test group by id,name,key)m
 group by id
 PREHOOK: type: QUERY
+PREHOOK: Input: default@count_distinct_test
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select id,count(Distinct name),count(Distinct key)
 from (select id,key,name from count_distinct_test group by id,name,key)m
 group by id
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@count_distinct_test
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -293,10 +305,14 @@ PREHOOK: query: explain select id,count(Distinct 
key),count(Distinct name)
 from (select id,key,name from count_distinct_test group by id,key,name)m
 group by id
 PREHOOK: type: QUERY
+PREHOOK: Input: default@count_distinct_test
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select id,count(Distinct key),count(Distinct name)
 from (select id,key,name from count_distinct_test group by id,key,name)m
 group by id
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@count_distinct_test
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -390,10 +406,14 @@ PREHOOK: query: explain select id,count(Distinct 
name),count(Distinct key)
 from (select id,key,name from count_distinct_test group by id,name,key)m
 group by id
 PREHOOK: type: QUERY
+PREHOOK: Input: default@count_distinct_test
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain select id,count(Distinct name),count(Distinct key)
 from (select id,key,name from count_distinct_test group by id,name,key)m
 group by id
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@count_distinct_test
+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/163caed7/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out 
b/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out
index aa20ec8..53d0f31 100644
--- a/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out
+++ b/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out
@@ -1,7 +1,11 @@
 PREHOOK: query: explain select key, sum(key) from (select * from src 
distribute by key sort by key, value) Q1 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, sum(key) from (select * from src 
distribute by key sort by key, value) Q1 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -59,8 +63,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key, sum(key), lower(value) from (select * from 
src order by key) Q1 group by key, lower(value)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, sum(key), lower(value) from (select * 
from src order by key) Q1 group by key, lower(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
@@ -123,8 +131,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key, sum(key), (X + 1) from (select key, (value 
+ 1) as X from src order by key) Q1 group by key, (X + 1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, sum(key), (X + 1) from (select key, 
(value + 1) as X from src order by key) Q1 group by key, (X + 1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -187,8 +199,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key, sum(key) as value from src group by key 
order by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, sum(key) as value from src group by key 
order by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -249,8 +265,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select src.key, sum(src.key) FROM src JOIN src1 ON 
src.key = src1.key group by src.key, src.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src.key, sum(src.key) FROM src JOIN src1 ON 
src.key = src1.key group by src.key, src.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -357,8 +379,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select src.key, src.value FROM src JOIN src1 ON 
src.key = src1.key order by src.key, src.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src.key, src.value FROM src JOIN src1 ON 
src.key = src1.key order by src.key, src.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -451,8 +479,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain from (select key, value from src group by key, value) 
s select s.key group by s.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain from (select key, value from src group by key, value) 
s select s.key group by s.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -519,8 +551,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key, count(distinct value) from (select key, 
value from src group by key, value) t group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, count(distinct value) from (select key, 
value from src group by key, value) t group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2558,8 +2594,12 @@ POSTHOOK: Input: default@src
 98     1
 PREHOOK: query: explain select key, sum(key) from (select * from src 
distribute by key sort by key, value) Q1 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, sum(key) from (select * from src 
distribute by key sort by key, value) Q1 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2617,8 +2657,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key, sum(key), lower(value) from (select * from 
src order by key) Q1 group by key, lower(value)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, sum(key), lower(value) from (select * 
from src order by key) Q1 group by key, lower(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
@@ -2681,8 +2725,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key, sum(key), (X + 1) from (select key, (value 
+ 1) as X from src order by key) Q1 group by key, (X + 1)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, sum(key), (X + 1) from (select key, 
(value + 1) as X from src order by key) Q1 group by key, (X + 1)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2745,8 +2793,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key, sum(key) as value from src group by key 
order by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, sum(key) as value from src group by key 
order by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2800,8 +2852,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select src.key, sum(src.key) FROM src JOIN src1 ON 
src.key = src1.key group by src.key, src.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src.key, sum(src.key) FROM src JOIN src1 ON 
src.key = src1.key group by src.key, src.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2901,8 +2959,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select src.key, src.value FROM src JOIN src1 ON 
src.key = src1.key order by src.key, src.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src.key, src.value FROM src JOIN src1 ON 
src.key = src1.key order by src.key, src.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2995,8 +3059,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain from (select key, value from src group by key, value) 
s select s.key group by s.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain from (select key, value from src group by key, value) 
s select s.key group by s.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -3058,8 +3126,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select key, count(distinct value) from (select key, 
value from src group by key, value) t group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key, count(distinct value) from (select key, 
value from src group by key, value) t group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/reopt_dpp.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/reopt_dpp.q.out 
b/ql/src/test/results/clientpositive/llap/reopt_dpp.q.out
index e248575..2db8740 100644
--- a/ql/src/test/results/clientpositive/llap/reopt_dpp.q.out
+++ b/ql/src/test/results/clientpositive/llap/reopt_dpp.q.out
@@ -117,6 +117,11 @@ select   count(*) cnt
        and s.ss_sold_date_sk = d.d_date_sk
        and d.d_year=2000
 PREHOOK: type: QUERY
+PREHOOK: Input: default@x1_date_dim
+PREHOOK: Input: default@x1_store_sales
+PREHOOK: Input: default@x1_store_sales@ss_sold_date_sk=1
+PREHOOK: Input: default@x1_store_sales@ss_sold_date_sk=2
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select   count(*) cnt
  from
@@ -127,6 +132,11 @@ select   count(*) cnt
        and s.ss_sold_date_sk = d.d_date_sk
        and d.d_year=2000
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@x1_date_dim
+POSTHOOK: Input: default@x1_store_sales
+POSTHOOK: Input: default@x1_store_sales@ss_sold_date_sk=1
+POSTHOOK: Input: default@x1_store_sales@ss_sold_date_sk=2
+#### A masked pattern was here ####
 Plan optimized by CBO.
 
 Vertex dependency in root stage
@@ -207,6 +217,11 @@ select   count(*) cnt
        and s.ss_sold_date_sk = d.d_date_sk
        and d.d_year=2000
 PREHOOK: type: QUERY
+PREHOOK: Input: default@x1_date_dim
+PREHOOK: Input: default@x1_store_sales
+PREHOOK: Input: default@x1_store_sales@ss_sold_date_sk=1
+PREHOOK: Input: default@x1_store_sales@ss_sold_date_sk=2
+#### A masked pattern was here ####
 POSTHOOK: query: explain reoptimization
 select   count(*) cnt
  from
@@ -217,6 +232,11 @@ select   count(*) cnt
        and s.ss_sold_date_sk = d.d_date_sk
        and d.d_year=2000
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@x1_date_dim
+POSTHOOK: Input: default@x1_store_sales
+POSTHOOK: Input: default@x1_store_sales@ss_sold_date_sk=1
+POSTHOOK: Input: default@x1_store_sales@ss_sold_date_sk=2
+#### A masked pattern was here ####
 Plan optimized by CBO.
 
 Vertex dependency in root stage

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/reopt_semijoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/reopt_semijoin.q.out 
b/ql/src/test/results/clientpositive/llap/reopt_semijoin.q.out
index 37143cb..10485bb 100644
--- a/ql/src/test/results/clientpositive/llap/reopt_semijoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/reopt_semijoin.q.out
@@ -116,6 +116,9 @@ select   sum(s.ss_item_sk)
         and s.ss_sold_date_sk=d.d_date_sk
        and d.d_moy=3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@x1_date_dim
+PREHOOK: Input: default@x1_store_sales
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select   sum(s.ss_item_sk)
  from
@@ -126,6 +129,9 @@ select   sum(s.ss_item_sk)
         and s.ss_sold_date_sk=d.d_date_sk
        and d.d_moy=3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@x1_date_dim
+POSTHOOK: Input: default@x1_store_sales
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -285,6 +291,9 @@ select   sum(s.ss_item_sk)
         and s.ss_sold_date_sk=d.d_date_sk
        and d.d_moy=3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@x1_date_dim
+PREHOOK: Input: default@x1_store_sales
+#### A masked pattern was here ####
 POSTHOOK: query: explain reoptimization
 select   sum(s.ss_item_sk)
  from
@@ -295,6 +304,9 @@ select   sum(s.ss_item_sk)
         and s.ss_sold_date_sk=d.d_date_sk
        and d.d_moy=3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@x1_date_dim
+POSTHOOK: Input: default@x1_store_sales
+#### 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/163caed7/ql/src/test/results/clientpositive/llap/results_cache_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/results_cache_1.q.out 
b/ql/src/test/results/clientpositive/llap/results_cache_1.q.out
index 2b8a288..86a110b 100644
--- a/ql/src/test/results/clientpositive/llap/results_cache_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/results_cache_1.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 select count(*) from src a join src b on (a.key = b.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from src a join src b on (a.key = b.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -111,9 +115,11 @@ test.comment="Cache should be used for this query"
 PREHOOK: query: explain
 select count(*) from src a join src b on (a.key = b.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
 POSTHOOK: query: explain
 select count(*) from src a join src b on (a.key = b.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -136,9 +142,13 @@ test.comment="Cache is disabled, should not be used here."
 PREHOOK: query: explain
 select count(*) from src a join src b on (a.key = b.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from src a join src b on (a.key = b.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -261,9 +271,13 @@ test.comment="Same query string, but different current 
database. Cache should no
 PREHOOK: query: explain
 select count(*) from src a join src b on (a.key = b.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: db1@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from src a join src b on (a.key = b.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: db1@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -386,11 +400,13 @@ select * from src where key = 0
 union all
 select * from src where key = 2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
 POSTHOOK: query: explain
 select * from src where key = 0
 union all
 select * from src where key = 2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -440,11 +456,13 @@ with q1 as ( select distinct key from q2 ),
 q2 as ( select key, value from src where key < 10 )
 select * from q1 a, q1 b where a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
 POSTHOOK: query: explain
 with q1 as ( select distinct key from q2 ),
 q2 as ( select key, value from src where key < 10 )
 select * from q1 a, q1 b where a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -498,12 +516,14 @@ q2 as ( select key, value from src where key < 10 ),
 q3 as ( select key, value from src where key = 0 )
 select * from q1 intersect all select * from q2 except all select * from q3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
 POSTHOOK: query: explain
 with q1 as ( select distinct key, value from src ),
 q2 as ( select key, value from src where key < 10 ),
 q3 as ( select key, value from src where key = 0 )
 select * from q1 intersect all select * from q2 except all select * from q3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -556,9 +576,19 @@ test.comment="Semijoin. Cache should be used now"
 PREHOOK: query: explain
 select a, c, count(*)  from (select key as a, c_int+1 as b, sum(c_int) as c 
from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or 
cbo_t1.c_float >= 0)  group by c_float, cbo_t1.c_int, key having cbo_t1.c_float 
> 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by a+b 
desc, c asc limit 5) cbo_t1 left semi join (select key as p, c_int+1 as q, 
sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 
or cbo_t2.c_float >= 0)  group by c_float, cbo_t2.c_int, key having 
cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 
order by q+r/10 desc, p limit 5) cbo_t2 on cbo_t1.a=p left semi join cbo_t3 on 
cbo_t1.a=key where (b + 1  >= 0) and (b > 0 or a >= 0) group by a, c  having a 
> 0 and (a >=1 or c >= 1) and (a + c) >= 0 order by c, a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t1
+PREHOOK: Input: default@cbo_t1@dt=2014
+PREHOOK: Input: default@cbo_t2
+PREHOOK: Input: default@cbo_t2@dt=2014
+PREHOOK: Input: default@cbo_t3
 POSTHOOK: query: explain
 select a, c, count(*)  from (select key as a, c_int+1 as b, sum(c_int) as c 
from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or 
cbo_t1.c_float >= 0)  group by c_float, cbo_t1.c_int, key having cbo_t1.c_float 
> 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by a+b 
desc, c asc limit 5) cbo_t1 left semi join (select key as p, c_int+1 as q, 
sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 
or cbo_t2.c_float >= 0)  group by c_float, cbo_t2.c_int, key having 
cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 
order by q+r/10 desc, p limit 5) cbo_t2 on cbo_t1.a=p left semi join cbo_t3 on 
cbo_t1.a=key where (b + 1  >= 0) and (b > 0 or a >= 0) group by a, c  having a 
> 0 and (a >=1 or c >= 1) and (a + c) >= 0 order by c, a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t1
+POSTHOOK: Input: default@cbo_t1@dt=2014
+POSTHOOK: Input: default@cbo_t2
+POSTHOOK: Input: default@cbo_t2@dt=2014
+POSTHOOK: Input: default@cbo_t3
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/results_cache_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/results_cache_2.q.out 
b/ql/src/test/results/clientpositive/llap/results_cache_2.q.out
index b17c58d..11dbacf 100644
--- a/ql/src/test/results/clientpositive/llap/results_cache_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/results_cache_2.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 select key, value from src where key=0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value from src where key=0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -37,9 +41,13 @@ test.comment=Query only requires fetch task - should not use 
results cache
 PREHOOK: query: explain
 select key, value from src where key=0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, value from src where key=0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -77,11 +85,13 @@ select c1, count(*)
 from (select sign(value) c1, value from src where key < 10) q
 group by c1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
 POSTHOOK: query: explain
 select c1, count(*)
 from (select sign(value) c1, value from src where key < 10) q
 group by c1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -112,11 +122,15 @@ select c1, count(*)
 from (select current_timestamp c1, value from src where key < 10) q
 group by c1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select c1, count(*)
 from (select current_timestamp c1, value from src where key < 10) q
 group by c1
 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
@@ -199,11 +213,15 @@ select c1, count(*)
 from (select sign(value) c1, value from src where key < 10) q
 group by c1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain analyze
 select c1, count(*)
 from (select sign(value) c1, value from src where key < 10) q
 group by c1
 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/163caed7/ql/src/test/results/clientpositive/llap/results_cache_capacity.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/results_cache_capacity.q.out 
b/ql/src/test/results/clientpositive/llap/results_cache_capacity.q.out
index df3e34c..965239c 100644
--- a/ql/src/test/results/clientpositive/llap/results_cache_capacity.q.out
+++ b/ql/src/test/results/clientpositive/llap/results_cache_capacity.q.out
@@ -11,9 +11,11 @@ test.comment=Q1 should be cached
 PREHOOK: query: explain
 select key, count(*) from src where key = 0 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
 POSTHOOK: query: explain
 select key, count(*) from src where key = 0 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -38,9 +40,11 @@ test.comment=Q2 should now be cached
 PREHOOK: query: explain
 select key, count(*) from src where key = 2 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
 POSTHOOK: query: explain
 select key, count(*) from src where key = 2 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -56,9 +60,11 @@ test.comment=Q1 should still be cached
 PREHOOK: query: explain
 select key, count(*) from src where key = 0 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
 POSTHOOK: query: explain
 select key, count(*) from src where key = 0 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -83,9 +89,11 @@ test.comment=Q3 should now be cached
 PREHOOK: query: explain
 select key, count(*) from src where key = 4 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
 POSTHOOK: query: explain
 select key, count(*) from src where key = 4 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -101,9 +109,11 @@ test.comment=Q1 should still be cached
 PREHOOK: query: explain
 select key, count(*) from src where key = 0 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
 POSTHOOK: query: explain
 select key, count(*) from src where key = 0 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -119,9 +129,13 @@ test.comment=Q2 should no longer be in the cache
 PREHOOK: query: explain
 select key, count(*) from src where key = 2 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, count(*) from src where key = 2 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -197,9 +211,13 @@ POSTHOOK: Input: default@src
 PREHOOK: query: explain
 select key, count(*) from src where key < 10 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, count(*) from src where key < 10 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/results_cache_diff_fs.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/results_cache_diff_fs.q.out 
b/ql/src/test/results/clientpositive/llap/results_cache_diff_fs.q.out
index d4e7db8..3cbdd68 100644
--- a/ql/src/test/results/clientpositive/llap/results_cache_diff_fs.q.out
+++ b/ql/src/test/results/clientpositive/llap/results_cache_diff_fs.q.out
@@ -2,9 +2,13 @@
 PREHOOK: query: explain
 select count(*) from src a join src b on (a.key = b.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain
 select count(*) from src a join src b on (a.key = b.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -112,9 +116,11 @@ test.comment="Cache should be used for this query"
 PREHOOK: query: explain
 select count(*) from src a join src b on (a.key = b.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
 POSTHOOK: query: explain
 select count(*) from src a join src b on (a.key = b.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/results_cache_empty_result.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/results_cache_empty_result.q.out 
b/ql/src/test/results/clientpositive/llap/results_cache_empty_result.q.out
index 350dd87..e85c8f4 100644
--- a/ql/src/test/results/clientpositive/llap/results_cache_empty_result.q.out
+++ b/ql/src/test/results/clientpositive/llap/results_cache_empty_result.q.out
@@ -1,9 +1,13 @@
 PREHOOK: query: explain
 select count(*), key from src a where key < 0 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*), key from src a where key < 0 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -78,9 +82,11 @@ test.comment="Cache should be used for this query"
 PREHOOK: query: explain
 select count(*), key from src a where key < 0 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
 POSTHOOK: query: explain
 select count(*), key from src a where key < 0 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/results_cache_invalidation.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/results_cache_invalidation.q.out 
b/ql/src/test/results/clientpositive/llap/results_cache_invalidation.q.out
index d4b55bb..778ac5e 100644
--- a/ql/src/test/results/clientpositive/llap/results_cache_invalidation.q.out
+++ b/ql/src/test/results/clientpositive/llap/results_cache_invalidation.q.out
@@ -38,9 +38,13 @@ test.comment="Run queries to load into cache"
 PREHOOK: query: explain
 select count(*) from tab1_n6 a where key >= 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab1_n6
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from tab1_n6 a where key >= 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab1_n6
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -109,9 +113,13 @@ POSTHOOK: Input: default@tab1_n6
 PREHOOK: query: explain
 select max(key) from tab2_n5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab2_n5
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select max(key) from tab2_n5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab2_n5
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -178,9 +186,15 @@ POSTHOOK: Input: default@tab2_n5
 PREHOOK: query: explain
 select count(*) from tab1_n6 join tab2_n5 on (tab1_n6.key = tab2_n5.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab1_n6
+PREHOOK: Input: default@tab2_n5
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from tab1_n6 join tab2_n5 on (tab1_n6.key = tab2_n5.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab1_n6
+POSTHOOK: Input: default@tab2_n5
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -290,9 +304,11 @@ test.comment="Q1 should now be able to use cache"
 PREHOOK: query: explain
 select count(*) from tab1_n6 a where key >= 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab1_n6
 POSTHOOK: query: explain
 select count(*) from tab1_n6 a where key >= 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab1_n6
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -315,9 +331,11 @@ test.comment="Q2 should now be able to use cache"
 PREHOOK: query: explain
 select max(key) from tab2_n5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab2_n5
 POSTHOOK: query: explain
 select max(key) from tab2_n5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab2_n5
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -340,9 +358,13 @@ test.comment="Q3 should now be able to use cache"
 PREHOOK: query: explain
 select count(*) from tab1_n6 join tab2_n5 on (tab1_n6.key = tab2_n5.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab1_n6
+PREHOOK: Input: default@tab2_n5
 POSTHOOK: query: explain
 select count(*) from tab1_n6 join tab2_n5 on (tab1_n6.key = tab2_n5.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab1_n6
+POSTHOOK: Input: default@tab2_n5
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -377,9 +399,13 @@ test.comment="Q1 should not use cache"
 PREHOOK: query: explain
 select count(*) from tab1_n6 a where key >= 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab1_n6
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from tab1_n6 a where key >= 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab1_n6
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -449,9 +475,11 @@ test.comment="Q2 should still use cache since tab2_n5 not 
updated"
 PREHOOK: query: explain
 select max(key) from tab2_n5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab2_n5
 POSTHOOK: query: explain
 select max(key) from tab2_n5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab2_n5
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -474,9 +502,15 @@ test.comment="Q3 should not use cache"
 PREHOOK: query: explain
 select count(*) from tab1_n6 join tab2_n5 on (tab1_n6.key = tab2_n5.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab1_n6
+PREHOOK: Input: default@tab2_n5
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from tab1_n6 join tab2_n5 on (tab1_n6.key = tab2_n5.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab1_n6
+POSTHOOK: Input: default@tab2_n5
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -596,9 +630,11 @@ test.comment="Q1 should use cache"
 PREHOOK: query: explain
 select count(*) from tab1_n6 a where key >= 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab1_n6
 POSTHOOK: query: explain
 select count(*) from tab1_n6 a where key >= 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab1_n6
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -621,9 +657,13 @@ test.comment="Q2 should not use cache"
 PREHOOK: query: explain
 select max(key) from tab2_n5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab2_n5
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select max(key) from tab2_n5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab2_n5
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -691,9 +731,15 @@ test.comment="Q3 should not use cache"
 PREHOOK: query: explain
 select count(*) from tab1_n6 join tab2_n5 on (tab1_n6.key = tab2_n5.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab1_n6
+PREHOOK: Input: default@tab2_n5
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from tab1_n6 join tab2_n5 on (tab1_n6.key = tab2_n5.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab1_n6
+POSTHOOK: Input: default@tab2_n5
+#### 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/163caed7/ql/src/test/results/clientpositive/llap/results_cache_invalidation2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/results_cache_invalidation2.q.out 
b/ql/src/test/results/clientpositive/llap/results_cache_invalidation2.q.out
index 62811ca..e363683 100644
--- a/ql/src/test/results/clientpositive/llap/results_cache_invalidation2.q.out
+++ b/ql/src/test/results/clientpositive/llap/results_cache_invalidation2.q.out
@@ -80,9 +80,11 @@ test.comment="Cached entry should be used"
 PREHOOK: query: explain
 select count(*) from tab1 where key > 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab1
 POSTHOOK: query: explain
 select count(*) from tab1 where key > 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab1
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -105,9 +107,13 @@ test.comment="Cached entry should be used"
 PREHOOK: query: explain
 select count(*) from tab1 join tab2 on (tab1.key = tab2.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab1
+PREHOOK: Input: default@tab2
 POSTHOOK: query: explain
 select count(*) from tab1 join tab2 on (tab1.key = tab2.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab1
+POSTHOOK: Input: default@tab2
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -132,9 +138,11 @@ test.comment="Cached entry should be used"
 PREHOOK: query: explain
 select count(*) from tab2 where key > 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab2
 POSTHOOK: query: explain
 select count(*) from tab2 where key > 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab2
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -176,9 +184,13 @@ test.comment="Cached entry should be invalidated - query 
should not use cache"
 PREHOOK: query: explain
 select count(*) from tab1 where key > 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from tab1 where key > 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -248,9 +260,15 @@ test.comment="Cached entry should be invalidated - query 
should not use cache"
 PREHOOK: query: explain
 select count(*) from tab1 join tab2 on (tab1.key = tab2.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab1
+PREHOOK: Input: default@tab2
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from tab1 join tab2 on (tab1.key = tab2.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab1
+POSTHOOK: Input: default@tab2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -360,9 +378,11 @@ test.comment="tab2 was not modified, this query should 
still use cache"
 PREHOOK: query: explain
 select count(*) from tab2 where key > 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab2
 POSTHOOK: query: explain
 select count(*) from tab2 where key > 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab2
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/results_cache_lifetime.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/results_cache_lifetime.q.out 
b/ql/src/test/results/clientpositive/llap/results_cache_lifetime.q.out
index 5cec79d..1f91217 100644
--- a/ql/src/test/results/clientpositive/llap/results_cache_lifetime.q.out
+++ b/ql/src/test/results/clientpositive/llap/results_cache_lifetime.q.out
@@ -20,9 +20,13 @@ test.comment="Cached entry should be expired - query should 
not use cache"
 PREHOOK: query: explain
 select count(*) from src a join src b on (a.key = b.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from src a join src b on (a.key = b.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/results_cache_quoted_identifiers.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/results_cache_quoted_identifiers.q.out
 
b/ql/src/test/results/clientpositive/llap/results_cache_quoted_identifiers.q.out
index 30a0cf7..98fe7be 100644
--- 
a/ql/src/test/results/clientpositive/llap/results_cache_quoted_identifiers.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/results_cache_quoted_identifiers.q.out
@@ -31,9 +31,13 @@ POSTHOOK: Lineage: quoted1.int EXPRESSION 
[(src)src.FieldSchema(name:key, type:s
 PREHOOK: query: explain
 select max(`_c1`), max(`int`), max(`col 3`), max(`col``4`) from quoted1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@quoted1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select max(`_c1`), max(`int`), max(`col 3`), max(`col``4`) from quoted1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@quoted1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -101,9 +105,11 @@ test.comment="Cache should be used for this query"
 PREHOOK: query: explain
 select max(`_c1`), max(`int`), max(`col 3`), max(`col``4`) from quoted1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@quoted1
 POSTHOOK: query: explain
 select max(`_c1`), max(`int`), max(`col 3`), max(`col``4`) from quoted1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@quoted1
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/results_cache_temptable.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/results_cache_temptable.q.out 
b/ql/src/test/results/clientpositive/llap/results_cache_temptable.q.out
index baaf299..ea687e1 100644
--- a/ql/src/test/results/clientpositive/llap/results_cache_temptable.q.out
+++ b/ql/src/test/results/clientpositive/llap/results_cache_temptable.q.out
@@ -63,9 +63,13 @@ test.comment="Query involving temp tables should not be 
added to the cache"
 PREHOOK: query: explain
 select count(*) from tmptab where key = 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tmptab
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from tmptab where key = 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tmptab
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -135,9 +139,11 @@ test.comment="Query should use the cache"
 PREHOOK: query: explain
 select count(*) from rct where key = 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@rct
 POSTHOOK: query: explain
 select count(*) from rct where key = 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@rct
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -163,9 +169,13 @@ test.comment="Cached query does not get used now that it 
resolves to a temp tabl
 PREHOOK: query: explain
 select count(*) from rct where key = 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@rct
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from rct where key = 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@rct
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -237,9 +247,13 @@ test.comment="Query should use the cache"
 PREHOOK: query: explain
 select count(*) from rct_part where ds="2008-04-08" and key = 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@rct_part
+PREHOOK: Input: default@rct_part@ds=2008-04-08
 POSTHOOK: query: explain
 select count(*) from rct_part where ds="2008-04-08" and key = 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@rct_part
+POSTHOOK: Input: default@rct_part@ds=2008-04-08
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -265,9 +279,13 @@ test.comment="Cached query does not get used now that it 
resolves to a temp tabl
 PREHOOK: query: explain
 select count(*) from rct_part where ds="2008-04-08" and key = 0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@rct_part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from rct_part where ds="2008-04-08" and key = 0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@rct_part
+#### 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/163caed7/ql/src/test/results/clientpositive/llap/results_cache_transactional.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/results_cache_transactional.q.out 
b/ql/src/test/results/clientpositive/llap/results_cache_transactional.q.out
index b57730a..e4beba6 100644
--- a/ql/src/test/results/clientpositive/llap/results_cache_transactional.q.out
+++ b/ql/src/test/results/clientpositive/llap/results_cache_transactional.q.out
@@ -37,9 +37,13 @@ POSTHOOK: Lineage: tab2_n1.value SIMPLE 
[(src)src.FieldSchema(name:value, type:s
 PREHOOK: query: explain
 select max(key) from tab1_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab1_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select max(key) from tab1_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab1_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -107,9 +111,11 @@ test.comment="Query on transactional table should use 
cache"
 PREHOOK: query: explain
 select max(key) from tab1_n1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab1_n1
 POSTHOOK: query: explain
 select max(key) from tab1_n1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab1_n1
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -131,9 +137,15 @@ POSTHOOK: Input: default@tab1_n1
 PREHOOK: query: explain
 select count(*) from tab1_n1 join tab2_n1 on (tab1_n1.key = tab2_n1.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab1_n1
+PREHOOK: Input: default@tab2_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from tab1_n1 join tab2_n1 on (tab1_n1.key = tab2_n1.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab1_n1
+POSTHOOK: Input: default@tab2_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -243,9 +255,13 @@ test.comment="Join on transactional tables, should use 
cache"
 PREHOOK: query: explain
 select count(*) from tab1_n1 join tab2_n1 on (tab1_n1.key = tab2_n1.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab1_n1
+PREHOOK: Input: default@tab2_n1
 POSTHOOK: query: explain
 select count(*) from tab1_n1 join tab2_n1 on (tab1_n1.key = tab2_n1.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab1_n1
+POSTHOOK: Input: default@tab2_n1
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -269,9 +285,13 @@ POSTHOOK: Input: default@tab2_n1
 PREHOOK: query: explain
 select max(key) from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select max(key) from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -339,9 +359,13 @@ test.comment="Query on non-transactional table should not 
use cache"
 PREHOOK: query: explain
 select max(key) from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select max(key) from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -408,9 +432,15 @@ POSTHOOK: Input: default@src
 PREHOOK: query: explain
 select count(*) from tab1_n1 join src on (tab1_n1.key = src.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@tab1_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from tab1_n1 join src on (tab1_n1.key = src.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@tab1_n1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -520,9 +550,15 @@ test.comment="Join uses non-transactional table, should 
not use cache"
 PREHOOK: query: explain
 select count(*) from tab1_n1 join src on (tab1_n1.key = src.key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@tab1_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from tab1_n1 join src on (tab1_n1.key = src.key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@tab1_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/163caed7/ql/src/test/results/clientpositive/llap/results_cache_truncate.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/results_cache_truncate.q.out 
b/ql/src/test/results/clientpositive/llap/results_cache_truncate.q.out
index 83b2144..8354cd6 100644
--- a/ql/src/test/results/clientpositive/llap/results_cache_truncate.q.out
+++ b/ql/src/test/results/clientpositive/llap/results_cache_truncate.q.out
@@ -19,9 +19,13 @@ POSTHOOK: Lineage: rct1_1.value SIMPLE 
[(src)src.FieldSchema(name:value, type:st
 PREHOOK: query: explain
 select count(*) from rct1_1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@rct1_1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from rct1_1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@rct1_1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -45,9 +49,13 @@ test.comment="Query on transactional table should use cache"
 PREHOOK: query: explain
 select count(*) from rct1_1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@rct1_1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from rct1_1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@rct1_1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -77,9 +85,13 @@ test.comment="Table truncated - query cache invalidated"
 PREHOOK: query: explain
 select count(*) from rct1_1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@rct1_1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from rct1_1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@rct1_1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -130,9 +142,13 @@ POSTHOOK: Lineage: rct1_2 PARTITION(p1=part2).value SIMPLE 
[(src)src.FieldSchema
 PREHOOK: query: explain
 select count(*) from rct1_2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@rct1_2
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from rct1_2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@rct1_2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -156,9 +172,13 @@ test.comment="Query on transactional table should use 
cache"
 PREHOOK: query: explain
 select count(*) from rct1_2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@rct1_2
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from rct1_2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@rct1_2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -188,9 +208,13 @@ test.comment="Partition truncated - query cache 
invalidated"
 PREHOOK: query: explain
 select count(*) from rct1_2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@rct1_2
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from rct1_2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@rct1_2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -222,9 +246,13 @@ test.comment="Table truncated - query cache invalidated"
 PREHOOK: query: explain
 select count(*) from rct1_2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@rct1_2
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*) from rct1_2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@rct1_2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/results_cache_with_masking.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/results_cache_with_masking.q.out 
b/ql/src/test/results/clientpositive/llap/results_cache_with_masking.q.out
index de9910f..ba3b280 100644
--- a/ql/src/test/results/clientpositive/llap/results_cache_with_masking.q.out
+++ b/ql/src/test/results/clientpositive/llap/results_cache_with_masking.q.out
@@ -13,9 +13,13 @@ POSTHOOK: Lineage: masking_test_n7.value SIMPLE 
[(src)src.FieldSchema(name:value
 PREHOOK: query: explain
 select key, count(*) from masking_test_n7 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@masking_test_n7
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, count(*) from masking_test_n7 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@masking_test_n7
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -89,9 +93,13 @@ POSTHOOK: Input: default@masking_test_n7
 PREHOOK: query: explain
 select key, count(*) from masking_test_n7 group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@masking_test_n7
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, count(*) from masking_test_n7 group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@masking_test_n7
+#### 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/163caed7/ql/src/test/results/clientpositive/llap/retry_failure_stat_changes.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/retry_failure_stat_changes.q.out 
b/ql/src/test/results/clientpositive/llap/retry_failure_stat_changes.q.out
index 09ae2f6..8ac5953 100644
--- a/ql/src/test/results/clientpositive/llap/retry_failure_stat_changes.q.out
+++ b/ql/src/test/results/clientpositive/llap/retry_failure_stat_changes.q.out
@@ -49,9 +49,15 @@ POSTHOOK: Input: default@tx_n2
 PREHOOK: query: explain REOPTIMIZATION 
 select sum(u*p) from tx_n2 join px on (u=p) where u<10 and p>2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@px
+PREHOOK: Input: default@tx_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain REOPTIMIZATION 
 select sum(u*p) from tx_n2 join px on (u=p) where u<10 and p>2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@px
+POSTHOOK: Input: default@tx_n2
+#### A masked pattern was here ####
 Plan optimized by CBO.
 
 Vertex dependency in root stage
@@ -106,9 +112,15 @@ POSTHOOK: Input: default@tx_n2
 PREHOOK: query: explain analyze
 select sum(u*p) from tx_n2 join px on (u=p) where u<10 and p>2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@px
+PREHOOK: Input: default@tx_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain analyze
 select sum(u*p) from tx_n2 join px on (u=p) where u<10 and p>2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@px
+POSTHOOK: Input: default@tx_n2
+#### A masked pattern was here ####
 Plan optimized by CBO.
 
 Vertex dependency in root stage
@@ -163,9 +175,15 @@ POSTHOOK: Input: default@tx_n2
 PREHOOK: query: explain analyze
 select sum(u*p) from tx_n2 join px on (u=p) where u<10 and p>2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@px
+PREHOOK: Input: default@tx_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain analyze
 select sum(u*p) from tx_n2 join px on (u=p) where u<10 and p>2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@px
+POSTHOOK: Input: default@tx_n2
+#### A masked pattern was here ####
 Plan optimized by CBO.
 
 Vertex dependency in root stage
@@ -207,9 +225,15 @@ Stage-0
 PREHOOK: query: explain
 select assert_true_oom(1 > sum(u*p)) from tx_n2 join px on (tx_n2.a=px.a) 
where u<10 and p>2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@px
+PREHOOK: Input: default@tx_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select assert_true_oom(1 > sum(u*p)) from tx_n2 join px on (tx_n2.a=px.a) 
where u<10 and p>2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@px
+POSTHOOK: Input: default@tx_n2
+#### A masked pattern was here ####
 Plan optimized by CBO.
 
 Vertex dependency in root stage

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/runtime_stats_hs2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/runtime_stats_hs2.q.out 
b/ql/src/test/results/clientpositive/llap/runtime_stats_hs2.q.out
index a94fb41..8721dd8 100644
--- a/ql/src/test/results/clientpositive/llap/runtime_stats_hs2.q.out
+++ b/ql/src/test/results/clientpositive/llap/runtime_stats_hs2.q.out
@@ -37,9 +37,15 @@ POSTHOOK: Lineage: px_n0.p SCRIPT []
 PREHOOK: query: explain
 select sum(u*p) from tx_n3 join px_n0 on (u=p) where u<10 and p>2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@px_n0
+PREHOOK: Input: default@tx_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select sum(u*p) from tx_n3 join px_n0 on (u=p) where u<10 and p>2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@px_n0
+POSTHOOK: Input: default@tx_n3
+#### A masked pattern was here ####
 Plan optimized by CBO.
 
 Vertex dependency in root stage
@@ -95,9 +101,15 @@ POSTHOOK: Input: default@tx_n3
 PREHOOK: query: explain
 select sum(u*p) from tx_n3 join px_n0 on (u=p) where u<10 and p>2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@px_n0
+PREHOOK: Input: default@tx_n3
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select sum(u*p) from tx_n3 join px_n0 on (u=p) where u<10 and p>2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@px_n0
+POSTHOOK: Input: default@tx_n3
+#### A masked pattern was here ####
 Plan optimized by CBO.
 
 Vertex dependency in root stage

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/runtime_stats_merge.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/runtime_stats_merge.q.out 
b/ql/src/test/results/clientpositive/llap/runtime_stats_merge.q.out
index 02f2134..9a0f6f4 100644
--- a/ql/src/test/results/clientpositive/llap/runtime_stats_merge.q.out
+++ b/ql/src/test/results/clientpositive/llap/runtime_stats_merge.q.out
@@ -92,12 +92,20 @@ merge into lineitem2 using
        on sub.L_ORDERKEY = lineitem2.L_ORDERKEY
        when matched then delete
 PREHOOK: type: QUERY
+PREHOOK: Input: default@lineitem2
+PREHOOK: Input: default@lineitem_stage
+PREHOOK: Output: default@lineitem2
+PREHOOK: Output: default@merge_tmp_table
 POSTHOOK: query: explain reoptimization
 merge into lineitem2 using
        (select * from lineitem_stage) sub
        on sub.L_ORDERKEY = lineitem2.L_ORDERKEY
        when matched then delete
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@lineitem2
+POSTHOOK: Input: default@lineitem_stage
+POSTHOOK: Output: default@lineitem2
+POSTHOOK: Output: default@merge_tmp_table
 POSTHOOK: Lineage: merge_tmp_table.val EXPRESSION 
[(lineitem2)lineitem2.FieldSchema(name:ROW__ID, 
type:struct<writeId:bigint,bucketId:int,rowId:bigint>, comment:), ]
 Vertex dependency in root stage
 Map 2 <- Map 1 (BROADCAST_EDGE)

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/sample1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/sample1.q.out 
b/ql/src/test/results/clientpositive/llap/sample1.q.out
index d274628..14944e3 100644
--- a/ql/src/test/results/clientpositive/llap/sample1.q.out
+++ b/ql/src/test/results/clientpositive/llap/sample1.q.out
@@ -11,11 +11,17 @@ INSERT OVERWRITE TABLE dest1_n89 SELECT s.*
 FROM srcpart TABLESAMPLE (BUCKET 1 OUT OF 1 ON rand()) s
 WHERE s.ds='2008-04-08' and s.hr='11'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Output: default@dest1_n89
 POSTHOOK: query: EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE dest1_n89 SELECT s.*
 FROM srcpart TABLESAMPLE (BUCKET 1 OUT OF 1 ON rand()) s
 WHERE s.ds='2008-04-08' and s.hr='11'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Output: default@dest1_n89
 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/163caed7/ql/src/test/results/clientpositive/llap/sample10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/sample10.q.out 
b/ql/src/test/results/clientpositive/llap/sample10.q.out
index 3ec7f33..05e132c 100644
--- a/ql/src/test/results/clientpositive/llap/sample10.q.out
+++ b/ql/src/test/results/clientpositive/llap/sample10.q.out
@@ -36,9 +36,21 @@ POSTHOOK: Lineage: srcpartbucket 
PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(s
 PREHOOK: query: explain extended
 select ds, count(1) from srcpartbucket tablesample (bucket 2 out of 4 on key) 
where ds is not null group by ds ORDER BY ds ASC
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpartbucket
+PREHOOK: Input: default@srcpartbucket@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpartbucket@ds=2008-04-08/hr=12
+PREHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select ds, count(1) from srcpartbucket tablesample (bucket 2 out of 4 on key) 
where ds is not null group by ds ORDER BY ds ASC
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpartbucket
+POSTHOOK: Input: default@srcpartbucket@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpartbucket@ds=2008-04-08/hr=12
+POSTHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpartbucket@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/163caed7/ql/src/test/results/clientpositive/llap/sample10_mm.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/sample10_mm.q.out 
b/ql/src/test/results/clientpositive/llap/sample10_mm.q.out
index 3448c2a..fb4c6d3 100644
--- a/ql/src/test/results/clientpositive/llap/sample10_mm.q.out
+++ b/ql/src/test/results/clientpositive/llap/sample10_mm.q.out
@@ -91,8 +91,20 @@ POSTHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=12
 4      val_4   2008-04-09      12
 PREHOOK: query: explain select key from srcpartbucket tablesample (bucket 2 
out of 4 on key)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpartbucket
+PREHOOK: Input: default@srcpartbucket@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpartbucket@ds=2008-04-08/hr=12
+PREHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain select key from srcpartbucket tablesample (bucket 2 
out of 4 on key)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpartbucket
+POSTHOOK: Input: default@srcpartbucket@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpartbucket@ds=2008-04-08/hr=12
+POSTHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=12
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -217,9 +229,21 @@ POSTHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=12
 PREHOOK: query: explain
         select key from srcpartbucket tablesample (bucket 2 out of 4 on key) 
group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpartbucket
+PREHOOK: Input: default@srcpartbucket@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpartbucket@ds=2008-04-08/hr=12
+PREHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=12
+#### A masked pattern was here ####
 POSTHOOK: query: explain
         select key from srcpartbucket tablesample (bucket 2 out of 4 on key) 
group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpartbucket
+POSTHOOK: Input: default@srcpartbucket@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpartbucket@ds=2008-04-08/hr=12
+POSTHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpartbucket@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/163caed7/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_part.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_part.q.out 
b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_part.q.out
index 3db05db..6c1c192 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_part.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_part.q.out
@@ -149,9 +149,15 @@ col1       col2    col3    col4    col5
 PREHOOK: query: explain vectorization only detail
 select insert_num,part,a,b,c,d from part_add_int_string_permute_select_n9
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part_add_int_string_permute_select_n9
+PREHOOK: Input: default@part_add_int_string_permute_select_n9@part=1
+#### A masked pattern was here ####
 POSTHOOK: query: explain vectorization only detail
 select insert_num,part,a,b,c,d from part_add_int_string_permute_select_n9
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part_add_int_string_permute_select_n9
+POSTHOOK: Input: default@part_add_int_string_permute_select_n9@part=1
+#### A masked pattern was here ####
 Explain
 PLAN VECTORIZATION:
   enabled: false

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_part_llap_io.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_part_llap_io.q.out
 
b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_part_llap_io.q.out
index c1cee59..ec3a9f8 100644
--- 
a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_part_llap_io.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_part_llap_io.q.out
@@ -149,9 +149,15 @@ col1       col2    col3    col4    col5
 PREHOOK: query: explain vectorization only detail
 select insert_num,part,a,b,c,d from part_add_int_string_permute_select_n5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part_add_int_string_permute_select_n5
+PREHOOK: Input: default@part_add_int_string_permute_select_n5@part=1
+#### A masked pattern was here ####
 POSTHOOK: query: explain vectorization only detail
 select insert_num,part,a,b,c,d from part_add_int_string_permute_select_n5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part_add_int_string_permute_select_n5
+POSTHOOK: Input: default@part_add_int_string_permute_select_n5@part=1
+#### A masked pattern was here ####
 Explain
 PLAN VECTORIZATION:
   enabled: false

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table.q.out 
b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table.q.out
index edc7e59..981f551 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table.q.out
@@ -60,9 +60,13 @@ col1 col2    col3    col4
 PREHOOK: query: explain vectorization only detail
 select insert_num,a,b,c from table_add_int_permute_select_n6
 PREHOOK: type: QUERY
+PREHOOK: Input: default@table_add_int_permute_select_n6
+#### A masked pattern was here ####
 POSTHOOK: query: explain vectorization only detail
 select insert_num,a,b,c from table_add_int_permute_select_n6
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@table_add_int_permute_select_n6
+#### A masked pattern was here ####
 Explain
 PLAN VECTORIZATION:
   enabled: false

http://git-wip-us.apache.org/repos/asf/hive/blob/163caed7/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_llap_io.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_llap_io.q.out
 
b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_llap_io.q.out
index e79db2a..808e308 100644
--- 
a/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_llap_io.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/schema_evol_orc_acid_table_llap_io.q.out
@@ -60,9 +60,13 @@ col1 col2    col3    col4
 PREHOOK: query: explain vectorization only detail
 select insert_num,a,b,c from table_add_int_permute_select_n0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@table_add_int_permute_select_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain vectorization only detail
 select insert_num,a,b,c from table_add_int_permute_select_n0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@table_add_int_permute_select_n0
+#### A masked pattern was here ####
 Explain
 PLAN VECTORIZATION:
   enabled: false

Reply via email to