http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/orc_merge4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_merge4.q.out 
b/ql/src/test/results/clientpositive/llap/orc_merge4.q.out
index 21c7162..a83f009 100644
--- a/ql/src/test/results/clientpositive/llap/orc_merge4.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_merge4.q.out
@@ -69,9 +69,17 @@ Found 1 items
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE orcfile_merge3b
     SELECT key, value FROM orcfile_merge3a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orcfile_merge3a
+PREHOOK: Input: default@orcfile_merge3a@ds=1
+PREHOOK: Input: default@orcfile_merge3a@ds=2
+PREHOOK: Output: default@orcfile_merge3b
 POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE orcfile_merge3b
     SELECT key, value FROM orcfile_merge3a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orcfile_merge3a
+POSTHOOK: Input: default@orcfile_merge3a@ds=1
+POSTHOOK: Input: default@orcfile_merge3a@ds=2
+POSTHOOK: Output: default@orcfile_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/c39b5d1b/ql/src/test/results/clientpositive/llap/orc_merge5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_merge5.q.out 
b/ql/src/test/results/clientpositive/llap/orc_merge5.q.out
index dfa5e12..998b625 100644
--- a/ql/src/test/results/clientpositive/llap/orc_merge5.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_merge5.q.out
@@ -24,8 +24,12 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@orc_merge5_n5
 PREHOOK: query: explain insert overwrite table orc_merge5b_n0 select 
userid,string1,subtype,decimal1,ts from orc_merge5_n5 where userid<=13
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_merge5_n5
+PREHOOK: Output: default@orc_merge5b_n0
 POSTHOOK: query: explain insert overwrite table orc_merge5b_n0 select 
userid,string1,subtype,decimal1,ts from orc_merge5_n5 where userid<=13
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orc_merge5_n5
+POSTHOOK: Output: default@orc_merge5b_n0
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -149,8 +153,12 @@ POSTHOOK: Input: default@orc_merge5b_n0
 5      eat     0.8     6       1969-12-31 16:00:20
 PREHOOK: query: explain insert overwrite table orc_merge5b_n0 select 
userid,string1,subtype,decimal1,ts from orc_merge5_n5 where userid<=13
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_merge5_n5
+PREHOOK: Output: default@orc_merge5b_n0
 POSTHOOK: query: explain insert overwrite table orc_merge5b_n0 select 
userid,string1,subtype,decimal1,ts from orc_merge5_n5 where userid<=13
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orc_merge5_n5
+POSTHOOK: Output: default@orc_merge5b_n0
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-8 depends on stages: Stage-1 , consists of Stage-5, Stage-4, Stage-6
@@ -350,8 +358,12 @@ POSTHOOK: Input: default@orc_merge5b_n0
 5      eat     0.8     6       1969-12-31 16:00:20
 PREHOOK: query: explain alter table orc_merge5b_n0 concatenate
 PREHOOK: type: ALTER_TABLE_MERGE
+PREHOOK: Input: default@orc_merge5b_n0
+PREHOOK: Output: default@orc_merge5b_n0
 POSTHOOK: query: explain alter table orc_merge5b_n0 concatenate
 POSTHOOK: type: ALTER_TABLE_MERGE
+POSTHOOK: Input: default@orc_merge5b_n0
+POSTHOOK: Output: default@orc_merge5b_n0
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/orc_merge6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_merge6.q.out 
b/ql/src/test/results/clientpositive/llap/orc_merge6.q.out
index c86c35b..a999d83 100644
--- a/ql/src/test/results/clientpositive/llap/orc_merge6.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_merge6.q.out
@@ -24,8 +24,12 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@orc_merge5_n4
 PREHOOK: query: explain insert overwrite table orc_merge5a_n1 partition 
(year="2000",hour=24) select userid,string1,subtype,decimal1,ts from 
orc_merge5_n4 where userid<=13
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_merge5_n4
+PREHOOK: Output: default@orc_merge5a_n1@year=2000/hour=24
 POSTHOOK: query: explain insert overwrite table orc_merge5a_n1 partition 
(year="2000",hour=24) select userid,string1,subtype,decimal1,ts from 
orc_merge5_n4 where userid<=13
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orc_merge5_n4
+POSTHOOK: Output: default@orc_merge5a_n1@year=2000/hour=24
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -202,8 +206,12 @@ POSTHOOK: Input: default@orc_merge5a_n1@year=2001/hour=24
 5      eat     0.8     6       1969-12-31 16:00:20     2001    24
 PREHOOK: query: explain insert overwrite table orc_merge5a_n1 partition 
(year="2000",hour=24) select userid,string1,subtype,decimal1,ts from 
orc_merge5_n4 where userid<=13
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_merge5_n4
+PREHOOK: Output: default@orc_merge5a_n1@year=2000/hour=24
 POSTHOOK: query: explain insert overwrite table orc_merge5a_n1 partition 
(year="2000",hour=24) select userid,string1,subtype,decimal1,ts from 
orc_merge5_n4 where userid<=13
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orc_merge5_n4
+POSTHOOK: Output: default@orc_merge5a_n1@year=2000/hour=24
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-8 depends on stages: Stage-1 , consists of Stage-5, Stage-4, Stage-6
@@ -498,8 +506,12 @@ POSTHOOK: Input: default@orc_merge5a_n1@year=2001/hour=24
 5      eat     0.8     6       1969-12-31 16:00:20     2001    24
 PREHOOK: query: explain alter table orc_merge5a_n1 
partition(year="2000",hour=24) concatenate
 PREHOOK: type: ALTER_PARTITION_MERGE
+PREHOOK: Input: default@orc_merge5a_n1
+PREHOOK: Output: default@orc_merge5a_n1@year=2000/hour=24
 POSTHOOK: query: explain alter table orc_merge5a_n1 
partition(year="2000",hour=24) concatenate
 POSTHOOK: type: ALTER_PARTITION_MERGE
+POSTHOOK: Input: default@orc_merge5a_n1
+POSTHOOK: Output: default@orc_merge5a_n1@year=2000/hour=24
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/orc_merge7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_merge7.q.out 
b/ql/src/test/results/clientpositive/llap/orc_merge7.q.out
index 0b30145..1f67f7b 100644
--- a/ql/src/test/results/clientpositive/llap/orc_merge7.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_merge7.q.out
@@ -24,8 +24,11 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@orc_merge5_n2
 PREHOOK: query: explain insert overwrite table orc_merge5a_n0 partition (st) 
select userid,string1,subtype,decimal1,ts,subtype from orc_merge5_n2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_merge5_n2
+PREHOOK: Output: default@orc_merge5a_n0
 POSTHOOK: query: explain insert overwrite table orc_merge5a_n0 partition (st) 
select userid,string1,subtype,decimal1,ts,subtype from orc_merge5_n2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orc_merge5_n2
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -236,8 +239,11 @@ POSTHOOK: Input: default@orc_merge5a_n0@st=80.0
 5      eat     0.8     6       1969-12-31 16:00:20     0.8
 PREHOOK: query: explain insert overwrite table orc_merge5a_n0 partition (st) 
select userid,string1,subtype,decimal1,ts,subtype from orc_merge5_n2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_merge5_n2
+PREHOOK: Output: default@orc_merge5a_n0
 POSTHOOK: query: explain insert overwrite table orc_merge5a_n0 partition (st) 
select userid,string1,subtype,decimal1,ts,subtype from orc_merge5_n2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orc_merge5_n2
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-8 depends on stages: Stage-1 , consists of Stage-5, Stage-4, Stage-6
@@ -605,8 +611,12 @@ POSTHOOK: Input: default@orc_merge5a_n0@st=80.0
 5      eat     0.8     6       1969-12-31 16:00:20     0.8
 PREHOOK: query: explain alter table orc_merge5a_n0 partition(st=80.0) 
concatenate
 PREHOOK: type: ALTER_PARTITION_MERGE
+PREHOOK: Input: default@orc_merge5a_n0
+PREHOOK: Output: default@orc_merge5a_n0@st=80.0
 POSTHOOK: query: explain alter table orc_merge5a_n0 partition(st=80.0) 
concatenate
 POSTHOOK: type: ALTER_PARTITION_MERGE
+POSTHOOK: Input: default@orc_merge5a_n0
+POSTHOOK: Output: default@orc_merge5a_n0@st=80.0
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/orc_merge_diff_fs.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_merge_diff_fs.q.out 
b/ql/src/test/results/clientpositive/llap/orc_merge_diff_fs.q.out
index 751bb40..dfc9346 100644
--- a/ql/src/test/results/clientpositive/llap/orc_merge_diff_fs.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_merge_diff_fs.q.out
@@ -45,11 +45,14 @@ PREHOOK: query: EXPLAIN
         SELECT key, value, PMOD(HASH(key), 2) as part
         FROM src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@orcfile_merge1_n0@ds=1
 POSTHOOK: query: EXPLAIN
     INSERT OVERWRITE TABLE orcfile_merge1_n0 PARTITION (ds='1', part)
         SELECT key, value, PMOD(HASH(key), 2) as part
         FROM src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -168,11 +171,14 @@ PREHOOK: query: EXPLAIN
         SELECT key, value, PMOD(HASH(key), 2) as part
         FROM src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@orcfile_merge1b_n0@ds=1
 POSTHOOK: query: EXPLAIN
     INSERT OVERWRITE TABLE orcfile_merge1b_n0 PARTITION (ds='1', part)
         SELECT key, value, PMOD(HASH(key), 2) as part
         FROM src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-8 depends on stages: Stage-1 , consists of Stage-5, Stage-4, Stage-6
@@ -341,11 +347,14 @@ PREHOOK: query: EXPLAIN
         SELECT key, value, PMOD(HASH(key), 2) as part
         FROM src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@orcfile_merge1c_n0@ds=1
 POSTHOOK: query: EXPLAIN
     INSERT OVERWRITE TABLE orcfile_merge1c_n0 PARTITION (ds='1', part)
         SELECT key, value, PMOD(HASH(key), 2) as part
         FROM src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-8 depends on stages: Stage-1 , consists of Stage-5, Stage-4, Stage-6

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/orc_merge_incompat1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_merge_incompat1.q.out 
b/ql/src/test/results/clientpositive/llap/orc_merge_incompat1.q.out
index 676af08..86873fc 100644
--- a/ql/src/test/results/clientpositive/llap/orc_merge_incompat1.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_merge_incompat1.q.out
@@ -24,8 +24,12 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@orc_merge5_n3
 PREHOOK: query: explain insert overwrite table orc_merge5b select 
userid,string1,subtype,decimal1,ts from orc_merge5_n3 where userid<=13
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_merge5_n3
+PREHOOK: Output: default@orc_merge5b
 POSTHOOK: query: explain insert overwrite table orc_merge5b select 
userid,string1,subtype,decimal1,ts from orc_merge5_n3 where userid<=13
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orc_merge5_n3
+POSTHOOK: Output: default@orc_merge5b
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/orc_merge_incompat2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_merge_incompat2.q.out 
b/ql/src/test/results/clientpositive/llap/orc_merge_incompat2.q.out
index 00d0a14e..5c5bc8e 100644
--- a/ql/src/test/results/clientpositive/llap/orc_merge_incompat2.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_merge_incompat2.q.out
@@ -24,8 +24,11 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@orc_merge5
 PREHOOK: query: explain insert overwrite table orc_merge5a partition (st) 
select userid,string1,subtype,decimal1,ts,subtype from orc_merge5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_merge5
+PREHOOK: Output: default@orc_merge5a
 POSTHOOK: query: explain insert overwrite table orc_merge5a partition (st) 
select userid,string1,subtype,decimal1,ts,subtype from orc_merge5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orc_merge5
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -307,8 +310,12 @@ POSTHOOK: Input: default@orc_merge5a@st=80.0
 5      eat     0.8     6       1969-12-31 16:00:20     0.8
 PREHOOK: query: explain alter table orc_merge5a partition(st=80.0) concatenate
 PREHOOK: type: ALTER_PARTITION_MERGE
+PREHOOK: Input: default@orc_merge5a
+PREHOOK: Output: default@orc_merge5a@st=80.0
 POSTHOOK: query: explain alter table orc_merge5a partition(st=80.0) concatenate
 POSTHOOK: type: ALTER_PARTITION_MERGE
+POSTHOOK: Input: default@orc_merge5a
+POSTHOOK: Output: default@orc_merge5a@st=80.0
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
   Stage-1 depends on stages: Stage-0

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/orc_ppd_date.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_ppd_date.q.out 
b/ql/src/test/results/clientpositive/llap/orc_ppd_date.q.out
index f86fe77..23d7b08 100644
--- a/ql/src/test/results/clientpositive/llap/orc_ppd_date.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_ppd_date.q.out
@@ -316,8 +316,12 @@ POSTHOOK: Output: default@test_lrl
 POSTHOOK: Lineage: test_lrl.c SCRIPT []
 PREHOOK: query: explain select count(*) from test_lrl where c='1900-01-01'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_lrl
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(*) from test_lrl where c='1900-01-01'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_lrl
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -394,8 +398,12 @@ POSTHOOK: Input: default@test_lrl
 1
 PREHOOK: query: explain select * from test_lrl where c=cast('1900-01-01' as 
date)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_lrl
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from test_lrl where c=cast('1900-01-01' as 
date)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_lrl
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -433,8 +441,12 @@ POSTHOOK: Input: default@test_lrl
 1900-01-01
 PREHOOK: query: explain select count(*) from test_lrl where c LIKE 
'1900-01-01%'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_lrl
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(*) from test_lrl where c LIKE 
'1900-01-01%'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_lrl
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/orc_predicate_pushdown.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/orc_predicate_pushdown.q.out 
b/ql/src/test/results/clientpositive/llap/orc_predicate_pushdown.q.out
index e29c3d9..9582d72 100644
--- a/ql/src/test/results/clientpositive/llap/orc_predicate_pushdown.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_predicate_pushdown.q.out
@@ -115,8 +115,12 @@ POSTHOOK: Input: default@orc_pred
 62430
 PREHOOK: query: EXPLAIN SELECT SUM(HASH(t)) FROM orc_pred
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT SUM(HASH(t)) FROM orc_pred
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -173,8 +177,12 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN SELECT SUM(HASH(t)) FROM orc_pred
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT SUM(HASH(t)) FROM orc_pred
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -300,11 +308,15 @@ PREHOOK: query: EXPLAIN SELECT SUM(HASH(t)) FROM orc_pred
   AND t < 0
   AND t > -2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT SUM(HASH(t)) FROM orc_pred
   WHERE t IS NOT NULL
   AND t < 0
   AND t > -2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -367,11 +379,15 @@ PREHOOK: query: EXPLAIN SELECT SUM(HASH(t)) FROM orc_pred
   AND t < 0
   AND t > -2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT SUM(HASH(t)) FROM orc_pred
   WHERE t IS NOT NULL
   AND t < 0
   AND t > -2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -467,11 +483,15 @@ PREHOOK: query: EXPLAIN SELECT t, s FROM orc_pred
   AND s IS NOT NULL
   AND s LIKE 'bob%'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT t, s FROM orc_pred
   WHERE t <=> -1
   AND s IS NOT NULL
   AND s LIKE 'bob%'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -494,11 +514,15 @@ PREHOOK: query: EXPLAIN SELECT t, s FROM orc_pred
   AND s IS NOT NULL
   AND s LIKE 'bob%'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT t, s FROM orc_pred
   WHERE t <=> -1
   AND s IS NOT NULL
   AND s LIKE 'bob%'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -566,6 +590,8 @@ PREHOOK: query: EXPLAIN SELECT t, s FROM orc_pred
   AND t BETWEEN 25 AND 30
   SORT BY t,s
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT t, s FROM orc_pred
   WHERE s IS NOT NULL
   AND s LIKE 'bob%'
@@ -573,6 +599,8 @@ POSTHOOK: query: EXPLAIN SELECT t, s FROM orc_pred
   AND t BETWEEN 25 AND 30
   SORT BY t,s
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -631,6 +659,8 @@ PREHOOK: query: EXPLAIN SELECT t, s FROM orc_pred
   AND t BETWEEN 25 AND 30
   SORT BY t,s
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT t, s FROM orc_pred
   WHERE s IS NOT NULL
   AND s LIKE 'bob%'
@@ -638,6 +668,8 @@ POSTHOOK: query: EXPLAIN SELECT t, s FROM orc_pred
   AND t BETWEEN 25 AND 30
   SORT BY t,s
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -759,6 +791,8 @@ PREHOOK: query: EXPLAIN SELECT t, si, d, s FROM orc_pred
   ORDER BY s DESC
   LIMIT 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT t, si, d, s FROM orc_pred
   WHERE d >= ROUND(9.99)
   AND d < 12
@@ -770,6 +804,8 @@ POSTHOOK: query: EXPLAIN SELECT t, si, d, s FROM orc_pred
   ORDER BY s DESC
   LIMIT 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -837,6 +873,8 @@ PREHOOK: query: EXPLAIN SELECT t, si, d, s FROM orc_pred
   ORDER BY s DESC
   LIMIT 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT t, si, d, s FROM orc_pred
   WHERE d >= ROUND(9.99)
   AND d < 12
@@ -848,6 +886,8 @@ POSTHOOK: query: EXPLAIN SELECT t, si, d, s FROM orc_pred
   ORDER BY s DESC
   LIMIT 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -980,6 +1020,8 @@ PREHOOK: query: EXPLAIN SELECT t, si, d, s FROM orc_pred
   SORT BY s DESC
   LIMIT 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT t, si, d, s FROM orc_pred
   WHERE t > 10
   AND t <> 101
@@ -993,6 +1035,8 @@ POSTHOOK: query: EXPLAIN SELECT t, si, d, s FROM orc_pred
   SORT BY s DESC
   LIMIT 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1079,6 +1123,8 @@ PREHOOK: query: EXPLAIN SELECT t, si, d, s FROM orc_pred
   SORT BY s DESC
   LIMIT 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT t, si, d, s FROM orc_pred
   WHERE t > 10
   AND t <> 101
@@ -1092,6 +1138,8 @@ POSTHOOK: query: EXPLAIN SELECT t, si, d, s FROM orc_pred
   SORT BY s DESC
   LIMIT 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orc_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/orc_struct_type_vectorization.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/orc_struct_type_vectorization.q.out 
b/ql/src/test/results/clientpositive/llap/orc_struct_type_vectorization.q.out
index da69c5f..b076b73 100644
--- 
a/ql/src/test/results/clientpositive/llap/orc_struct_type_vectorization.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/orc_struct_type_vectorization.q.out
@@ -74,8 +74,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 1023
 PREHOOK: query: explain vectorization expression select st1, st1.f1, st1.f2, 
st2, st2.f1, st2.f3 from orc_struct_type limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_struct_type
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain vectorization expression select st1, st1.f1, st1.f2, 
st2, st2.f1, st2.f3 from orc_struct_type limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orc_struct_type
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PLAN VECTORIZATION:
   enabled: true
   enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
@@ -195,8 +199,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 10     2010
 PREHOOK: query: explain vectorization expression select sum(st1.f1), st1.f1 
from orc_struct_type where st1.f1 > 500 group by st1.f1 limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@orc_struct_type
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain vectorization expression select sum(st1.f1), st1.f1 
from orc_struct_type where st1.f1 > 500 group by st1.f1 limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@orc_struct_type
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PLAN VECTORIZATION:
   enabled: true
   enabledConditionsMet: [hive.vectorized.execution.enabled IS true]

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/parallel.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/parallel.q.out 
b/ql/src/test/results/clientpositive/llap/parallel.q.out
index 904f6b7..692bb8c 100644
--- a/ql/src/test/results/clientpositive/llap/parallel.q.out
+++ b/ql/src/test/results/clientpositive/llap/parallel.q.out
@@ -19,11 +19,17 @@ from (select key, value from src group by key, value) s
 insert overwrite table src_a select s.key, s.value group by s.key, s.value
 insert overwrite table src_b_n0 select s.key, s.value group by s.key, s.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@src_a
+PREHOOK: Output: default@src_b_n0
 POSTHOOK: query: explain
 from (select key, value from src group by key, value) s
 insert overwrite table src_a select s.key, s.value group by s.key, s.value
 insert overwrite table src_b_n0 select s.key, s.value group by s.key, s.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@src_a
+POSTHOOK: Output: default@src_b_n0
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/parallel_colstats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/parallel_colstats.q.out 
b/ql/src/test/results/clientpositive/llap/parallel_colstats.q.out
index ef03868..91a450a 100644
--- a/ql/src/test/results/clientpositive/llap/parallel_colstats.q.out
+++ b/ql/src/test/results/clientpositive/llap/parallel_colstats.q.out
@@ -19,11 +19,17 @@ from (select key, value from src group by key, value) s
 insert overwrite table src_a_n0 select s.key, s.value group by s.key, s.value
 insert overwrite table src_b_n1 select s.key, s.value group by s.key, s.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@src_a_n0
+PREHOOK: Output: default@src_b_n1
 POSTHOOK: query: explain
 from (select key, value from src group by key, value) s
 insert overwrite table src_a_n0 select s.key, s.value group by s.key, s.value
 insert overwrite table src_b_n1 select s.key, s.value group by s.key, s.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@src_a_n0
+POSTHOOK: Output: default@src_b_n1
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/parquet_complex_types_vectorization.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/parquet_complex_types_vectorization.q.out
 
b/ql/src/test/results/clientpositive/llap/parquet_complex_types_vectorization.q.out
index f4d6218..d567dcb 100644
--- 
a/ql/src/test/results/clientpositive/llap/parquet_complex_types_vectorization.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/parquet_complex_types_vectorization.q.out
@@ -86,8 +86,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 1023
 PREHOOK: query: explain vectorization expression select l1, l1[0], l1[1], 
l1[listIndex], listIndex from parquet_complex_types limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@parquet_complex_types
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain vectorization expression select l1, l1[0], l1[1], 
l1[listIndex], listIndex from parquet_complex_types limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@parquet_complex_types
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PLAN VECTORIZATION:
   enabled: true
   enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
@@ -171,8 +175,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 [118,119]      118     119     119     1
 PREHOOK: query: explain vectorization expression select sum(l1[0]), l1[1] from 
parquet_complex_types where l1[0] > 1000 group by l1[1] order by l1[1] limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@parquet_complex_types
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain vectorization expression select sum(l1[0]), l1[1] 
from parquet_complex_types where l1[0] > 1000 group by l1[1] order by l1[1] 
limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@parquet_complex_types
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PLAN VECTORIZATION:
   enabled: true
   enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
@@ -374,8 +382,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 1024
 PREHOOK: query: explain vectorization expression select l1, l1[0], l1[1], 
l1[listIndex], listIndex from parquet_complex_types limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@parquet_complex_types
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain vectorization expression select l1, l1[0], l1[1], 
l1[listIndex], listIndex from parquet_complex_types limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@parquet_complex_types
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PLAN VECTORIZATION:
   enabled: true
   enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
@@ -459,8 +471,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 [118,119]      118     119     119     1
 PREHOOK: query: explain vectorization expression select sum(l1[0]), l1[1] from 
parquet_complex_types where l1[0] > 1000 group by l1[1] order by l1[1] limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@parquet_complex_types
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain vectorization expression select sum(l1[0]), l1[1] 
from parquet_complex_types where l1[0] > 1000 group by l1[1] order by l1[1] 
limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@parquet_complex_types
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PLAN VECTORIZATION:
   enabled: true
   enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
@@ -662,8 +678,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 1025
 PREHOOK: query: explain vectorization expression select l1, l1[0], l1[1], 
l1[listIndex], listIndex from parquet_complex_types limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@parquet_complex_types
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain vectorization expression select l1, l1[0], l1[1], 
l1[listIndex], listIndex from parquet_complex_types limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@parquet_complex_types
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PLAN VECTORIZATION:
   enabled: true
   enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
@@ -747,8 +767,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 [118,119]      118     119     119     1
 PREHOOK: query: explain vectorization expression select sum(l1[0]), l1[1] from 
parquet_complex_types where l1[0] > 1000 group by l1[1] order by l1[1] limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@parquet_complex_types
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain vectorization expression select sum(l1[0]), l1[1] 
from parquet_complex_types where l1[0] > 1000 group by l1[1] order by l1[1] 
limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@parquet_complex_types
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PLAN VECTORIZATION:
   enabled: true
   enabledConditionsMet: [hive.vectorized.execution.enabled IS true]

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/parquet_map_type_vectorization.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/parquet_map_type_vectorization.q.out 
b/ql/src/test/results/clientpositive/llap/parquet_map_type_vectorization.q.out
index a2bb0f3..e8f82db 100644
--- 
a/ql/src/test/results/clientpositive/llap/parquet_map_type_vectorization.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/parquet_map_type_vectorization.q.out
@@ -97,9 +97,13 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain vectorization expression select stringMap, intMap, 
doubleMap, stringMap['k2'], intMap[456],
 doubleMap[123.123], stringMap[stringIndex], intMap[intIndex], 
doubleMap[doubleIndex] from parquet_map_type limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@parquet_map_type
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain vectorization expression select stringMap, intMap, 
doubleMap, stringMap['k2'], intMap[456],
 doubleMap[123.123], stringMap[stringIndex], intMap[intIndex], 
doubleMap[doubleIndex] from parquet_map_type limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@parquet_map_type
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PLAN VECTORIZATION:
   enabled: true
   enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
@@ -186,9 +190,13 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain vectorization expression select sum(intMap[123]), 
sum(doubleMap[123.123]), stringMap['k1']
 from parquet_map_type where stringMap['k1'] like 'v100%' group by 
stringMap['k1'] order by stringMap['k1'] limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@parquet_map_type
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain vectorization expression select sum(intMap[123]), 
sum(doubleMap[123.123]), stringMap['k1']
 from parquet_map_type where stringMap['k1'] like 'v100%' group by 
stringMap['k1'] order by stringMap['k1'] limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@parquet_map_type
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PLAN VECTORIZATION:
   enabled: true
   enabledConditionsMet: [hive.vectorized.execution.enabled IS true]

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown.q.out 
b/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown.q.out
index eaa7e5d..99521f6 100644
--- a/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown.q.out
+++ b/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown.q.out
@@ -107,8 +107,12 @@ POSTHOOK: Input: default@tbl_pred
 62430
 PREHOOK: query: EXPLAIN SELECT SUM(HASH(t)) FROM tbl_pred
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT SUM(HASH(t)) FROM tbl_pred
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -165,8 +169,12 @@ STAGE PLANS:
 
 PREHOOK: query: EXPLAIN SELECT SUM(HASH(t)) FROM tbl_pred
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT SUM(HASH(t)) FROM tbl_pred
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -311,12 +319,16 @@ PREHOOK: query: EXPLAIN SELECT * FROM tbl_pred
   AND t > -2
   LIMIT 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT * FROM tbl_pred
   WHERE t IS NOT NULL
   AND t < 0
   AND t > -2
   LIMIT 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -342,12 +354,16 @@ PREHOOK: query: EXPLAIN SELECT * FROM tbl_pred
   AND t > -2
   LIMIT 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT * FROM tbl_pred
   WHERE t IS NOT NULL
   AND t < 0
   AND t > -2
   LIMIT 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -405,11 +421,15 @@ PREHOOK: query: EXPLAIN SELECT t, s FROM tbl_pred
   AND s IS NOT NULL
   AND s LIKE 'bob%'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT t, s FROM tbl_pred
   WHERE t <=> -1
   AND s IS NOT NULL
   AND s LIKE 'bob%'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -432,11 +452,15 @@ PREHOOK: query: EXPLAIN SELECT t, s FROM tbl_pred
   AND s IS NOT NULL
   AND s LIKE 'bob%'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT t, s FROM tbl_pred
   WHERE t <=> -1
   AND s IS NOT NULL
   AND s LIKE 'bob%'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -504,6 +528,8 @@ PREHOOK: query: EXPLAIN SELECT t, s FROM tbl_pred
   AND t BETWEEN 25 AND 30
   SORT BY t,s
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT t, s FROM tbl_pred
   WHERE s IS NOT NULL
   AND s LIKE 'bob%'
@@ -511,6 +537,8 @@ POSTHOOK: query: EXPLAIN SELECT t, s FROM tbl_pred
   AND t BETWEEN 25 AND 30
   SORT BY t,s
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -569,6 +597,8 @@ PREHOOK: query: EXPLAIN SELECT t, s FROM tbl_pred
   AND t BETWEEN 25 AND 30
   SORT BY t,s
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT t, s FROM tbl_pred
   WHERE s IS NOT NULL
   AND s LIKE 'bob%'
@@ -576,6 +606,8 @@ POSTHOOK: query: EXPLAIN SELECT t, s FROM tbl_pred
   AND t BETWEEN 25 AND 30
   SORT BY t,s
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -697,6 +729,8 @@ PREHOOK: query: EXPLAIN SELECT t, si, d, s FROM tbl_pred
   ORDER BY s DESC
   LIMIT 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT t, si, d, s FROM tbl_pred
   WHERE d >= ROUND(9.99)
   AND d < 12
@@ -708,6 +742,8 @@ POSTHOOK: query: EXPLAIN SELECT t, si, d, s FROM tbl_pred
   ORDER BY s DESC
   LIMIT 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -775,6 +811,8 @@ PREHOOK: query: EXPLAIN SELECT t, si, d, s FROM tbl_pred
   ORDER BY s DESC
   LIMIT 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT t, si, d, s FROM tbl_pred
   WHERE d >= ROUND(9.99)
   AND d < 12
@@ -786,6 +824,8 @@ POSTHOOK: query: EXPLAIN SELECT t, si, d, s FROM tbl_pred
   ORDER BY s DESC
   LIMIT 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -963,6 +1003,8 @@ PREHOOK: query: EXPLAIN SELECT t, si, d, s FROM tbl_pred
   SORT BY s DESC
   LIMIT 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT t, si, d, s FROM tbl_pred
   WHERE t > 10
   AND t <> 101
@@ -976,6 +1018,8 @@ POSTHOOK: query: EXPLAIN SELECT t, si, d, s FROM tbl_pred
   SORT BY s DESC
   LIMIT 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1062,6 +1106,8 @@ PREHOOK: query: EXPLAIN SELECT t, si, d, s FROM tbl_pred
   SORT BY s DESC
   LIMIT 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT t, si, d, s FROM tbl_pred
   WHERE t > 10
   AND t <> 101
@@ -1075,6 +1121,8 @@ POSTHOOK: query: EXPLAIN SELECT t, si, d, s FROM tbl_pred
   SORT BY s DESC
   LIMIT 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1168,6 +1216,8 @@ PREHOOK: query: EXPLAIN SELECT f, i, b FROM tbl_pred
   SORT BY f DESC
   LIMIT 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN SELECT f, i, b FROM tbl_pred
   WHERE f IS NOT NULL
   AND f < 123.2
@@ -1187,6 +1237,8 @@ POSTHOOK: query: EXPLAIN SELECT f, i, b FROM tbl_pred
   SORT BY f DESC
   LIMIT 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tbl_pred
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/parquet_struct_type_vectorization.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/parquet_struct_type_vectorization.q.out
 
b/ql/src/test/results/clientpositive/llap/parquet_struct_type_vectorization.q.out
index 7249363..4603f7d 100644
--- 
a/ql/src/test/results/clientpositive/llap/parquet_struct_type_vectorization.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/parquet_struct_type_vectorization.q.out
@@ -74,8 +74,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 1023
 PREHOOK: query: explain vectorization expression select st1, st1.f1, st1.f2, 
st2, st2.f1, st2.f3 from parquet_struct_type limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@parquet_struct_type
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain vectorization expression select st1, st1.f1, st1.f2, 
st2, st2.f1, st2.f3 from parquet_struct_type limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@parquet_struct_type
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PLAN VECTORIZATION:
   enabled: true
   enabledConditionsMet: [hive.vectorized.execution.enabled IS true]
@@ -195,8 +199,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 10     2010
 PREHOOK: query: explain vectorization expression select sum(st1.f1), st1.f1 
from parquet_struct_type where st1.f1 > 500 group by st1.f1 limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@parquet_struct_type
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: explain vectorization expression select sum(st1.f1), st1.f1 
from parquet_struct_type where st1.f1 > 500 group by st1.f1 limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@parquet_struct_type
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PLAN VECTORIZATION:
   enabled: true
   enabledConditionsMet: [hive.vectorized.execution.enabled IS true]

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/parquet_types_vectorization.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/parquet_types_vectorization.q.out 
b/ql/src/test/results/clientpositive/llap/parquet_types_vectorization.q.out
index ae1a1cb..4cc93bd 100644
--- a/ql/src/test/results/clientpositive/llap/parquet_types_vectorization.q.out
+++ b/ql/src/test/results/clientpositive/llap/parquet_types_vectorization.q.out
@@ -162,6 +162,8 @@ FROM parquet_types_n0
 GROUP BY ctinyint
 ORDER BY ctinyint
 PREHOOK: type: QUERY
+PREHOOK: Input: default@parquet_types_n0
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: EXPLAIN SELECT ctinyint,
   MAX(cint),
   MIN(csmallint),
@@ -172,6 +174,8 @@ FROM parquet_types_n0
 GROUP BY ctinyint
 ORDER BY ctinyint
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@parquet_types_n0
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -276,8 +280,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 3      120     1       7       1.17143 1.8
 PREHOOK: query: EXPLAIN SELECT cfloat, count(*) FROM parquet_types_n0 GROUP BY 
cfloat ORDER BY cfloat
 PREHOOK: type: QUERY
+PREHOOK: Input: default@parquet_types_n0
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: EXPLAIN SELECT cfloat, count(*) FROM parquet_types_n0 GROUP 
BY cfloat ORDER BY cfloat
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@parquet_types_n0
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -364,8 +372,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 1.4    4
 PREHOOK: query: EXPLAIN SELECT cchar, count(*) FROM parquet_types_n0 GROUP BY 
cchar ORDER BY cchar
 PREHOOK: type: QUERY
+PREHOOK: Input: default@parquet_types_n0
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: EXPLAIN SELECT cchar, count(*) FROM parquet_types_n0 GROUP BY 
cchar ORDER BY cchar
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@parquet_types_n0
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -465,8 +477,12 @@ vwxyz      1
 wxyza  1
 PREHOOK: query: EXPLAIN SELECT cvarchar, count(*) FROM parquet_types_n0 GROUP 
BY cvarchar ORDER BY cvarchar
 PREHOOK: type: QUERY
+PREHOOK: Input: default@parquet_types_n0
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: EXPLAIN SELECT cvarchar, count(*) FROM parquet_types_n0 GROUP 
BY cvarchar ORDER BY cvarchar
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@parquet_types_n0
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -562,8 +578,12 @@ abcdefgh   1
 b      1
 PREHOOK: query: EXPLAIN SELECT cstring1, count(*) FROM parquet_types_n0 GROUP 
BY cstring1 ORDER BY cstring1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@parquet_types_n0
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: EXPLAIN SELECT cstring1, count(*) FROM parquet_types_n0 GROUP 
BY cstring1 ORDER BY cstring1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@parquet_types_n0
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -666,8 +686,12 @@ yza        1
 zab    1
 PREHOOK: query: EXPLAIN SELECT t, count(*) FROM parquet_types_n0 GROUP BY t 
ORDER BY t
 PREHOOK: type: QUERY
+PREHOOK: Input: default@parquet_types_n0
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: EXPLAIN SELECT t, count(*) FROM parquet_types_n0 GROUP BY t 
ORDER BY t
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@parquet_types_n0
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -771,8 +795,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 2032-10-10 22:22:22.222222222  1
 PREHOOK: query: EXPLAIN SELECT hex(cbinary), count(*) FROM parquet_types_n0 
GROUP BY cbinary
 PREHOOK: type: QUERY
+PREHOOK: Input: default@parquet_types_n0
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: EXPLAIN SELECT hex(cbinary), count(*) FROM parquet_types_n0 
GROUP BY cbinary
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@parquet_types_n0
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/partialdhj.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/partialdhj.q.out 
b/ql/src/test/results/clientpositive/llap/partialdhj.q.out
index fde5496..fbbd204 100644
--- a/ql/src/test/results/clientpositive/llap/partialdhj.q.out
+++ b/ql/src/test/results/clientpositive/llap/partialdhj.q.out
@@ -10,6 +10,9 @@ FROM (
 JOIN src
 ON (a.value = src.value)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM (
@@ -22,6 +25,9 @@ FROM (
 JOIN src
 ON (a.value = 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
@@ -240,6 +246,9 @@ JOIN (
 ) a
 ON (src.value = a.value)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN
 SELECT *
 FROM src
@@ -252,6 +261,9 @@ JOIN (
 ) a
 ON (src.value = a.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

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/partition_multilevels.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/partition_multilevels.q.out 
b/ql/src/test/results/clientpositive/llap/partition_multilevels.q.out
index 3df6e2f..1bbdc21 100644
--- a/ql/src/test/results/clientpositive/llap/partition_multilevels.q.out
+++ b/ql/src/test/results/clientpositive/llap/partition_multilevels.q.out
@@ -964,8 +964,24 @@ POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3
 2222   333     11      19
 PREHOOK: query: explain select level1, level2, level3, count(*) from 
partition_test_multilevel where (level1 = '2222') and (level2 between '222' and 
'333') and (level3 between '11' and '33') group by level1, level2, level3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@partition_test_multilevel
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=11
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=22
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=33
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=11
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=22
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=33
+#### A masked pattern was here ####
 POSTHOOK: query: explain select level1, level2, level3, count(*) from 
partition_test_multilevel where (level1 = '2222') and (level2 between '222' and 
'333') and (level3 between '11' and '33') group by level1, level2, level3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@partition_test_multilevel
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=11
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=22
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=33
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=11
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=22
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=33
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1554,8 +1570,24 @@ POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3
 2222   333     11      19
 PREHOOK: query: explain select level1, level2, level3, count(*) from 
partition_test_multilevel where (level1 = '2222') and (level2 between '222' and 
'333') and (level3 between '11' and '33') group by level1, level2, level3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@partition_test_multilevel
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=11
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=22
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=33
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=11
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=22
+PREHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=33
+#### A masked pattern was here ####
 POSTHOOK: query: explain select level1, level2, level3, count(*) from 
partition_test_multilevel where (level1 = '2222') and (level2 between '222' and 
'333') and (level3 between '11' and '33') group by level1, level2, level3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@partition_test_multilevel
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=11
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=22
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=222/level3=33
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=11
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=22
+POSTHOOK: Input: 
default@partition_test_multilevel@level1=2222/level2=333/level3=33
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/partition_pruning.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/partition_pruning.q.out 
b/ql/src/test/results/clientpositive/llap/partition_pruning.q.out
index 829ab15..644f223 100644
--- a/ql/src/test/results/clientpositive/llap/partition_pruning.q.out
+++ b/ql/src/test/results/clientpositive/llap/partition_pruning.q.out
@@ -94,8 +94,14 @@ POSTHOOK: Input: default@daysales@dt=2001-01-03
 3      2001-01-03
 PREHOOK: query: explain extended select * from daysales where 
nvl(dt='2001-01-01' and customer=1, false)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@daysales
+PREHOOK: Input: default@daysales@dt=2001-01-01
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select * from daysales where 
nvl(dt='2001-01-01' and customer=1, false)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@daysales
+POSTHOOK: Input: default@daysales@dt=2001-01-01
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -164,8 +170,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain extended select * from daysales where 
nvl(dt='2001-01-01' or customer=3, false)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@daysales
+PREHOOK: Input: default@daysales@dt=2001-01-01
+PREHOOK: Input: default@daysales@dt=2001-01-03
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select * from daysales where 
nvl(dt='2001-01-01' or customer=3, false)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@daysales
+POSTHOOK: Input: default@daysales@dt=2001-01-01
+POSTHOOK: Input: default@daysales@dt=2001-01-03
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -280,8 +294,16 @@ STAGE PLANS:
 
 PREHOOK: query: explain extended select * from daysales where 
nvl(dt='2001-01-01' or customer=3, false)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@daysales
+PREHOOK: Input: default@daysales@dt=2001-01-01
+PREHOOK: Input: default@daysales@dt=2001-01-03
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select * from daysales where 
nvl(dt='2001-01-01' or customer=3, false)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@daysales
+POSTHOOK: Input: default@daysales@dt=2001-01-01
+POSTHOOK: Input: default@daysales@dt=2001-01-03
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/partition_shared_scan.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/partition_shared_scan.q.out 
b/ql/src/test/results/clientpositive/llap/partition_shared_scan.q.out
index fd33f12..a196928 100644
--- a/ql/src/test/results/clientpositive/llap/partition_shared_scan.q.out
+++ b/ql/src/test/results/clientpositive/llap/partition_shared_scan.q.out
@@ -35,6 +35,11 @@ join part p1 on (p1.p_partkey = f1.i)
 join foo_n1 f2 on (f1.i = f2.i)
 where f1.s='foo_n1' and f2.s='bar'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@foo_n1
+PREHOOK: Input: default@foo_n1@s=bar
+PREHOOK: Input: default@foo_n1@s=foo_n1
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select *
 from foo_n1 f1
@@ -42,6 +47,11 @@ join part p1 on (p1.p_partkey = f1.i)
 join foo_n1 f2 on (f1.i = f2.i)
 where f1.s='foo_n1' and f2.s='bar'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@foo_n1
+POSTHOOK: Input: default@foo_n1@s=bar
+POSTHOOK: Input: default@foo_n1@s=foo_n1
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -166,6 +176,10 @@ join part p1 on (p1.p_partkey = f1.i)
 join foo_n1 f2 on (f1.i = f2.i)
 where f1.s='foo_n1' and f2.s='foo_n1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@foo_n1
+PREHOOK: Input: default@foo_n1@s=foo_n1
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select *
 from foo_n1 f1
@@ -173,6 +187,10 @@ join part p1 on (p1.p_partkey = f1.i)
 join foo_n1 f2 on (f1.i = f2.i)
 where f1.s='foo_n1' and f2.s='foo_n1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@foo_n1
+POSTHOOK: Input: default@foo_n1@s=foo_n1
+POSTHOOK: Input: default@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/c39b5d1b/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out 
b/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out
index 0f20c9b..21bc58b 100644
--- a/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out
+++ b/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out
@@ -133,9 +133,23 @@ POSTHOOK: Lineage: t1_n113.value EXPRESSION 
[(t1_new_n0)t1_new_n0.FieldSchema(na
 PREHOOK: query: explain extended
 select * from t1_n113 where ds = '2011-10-13'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_mapping
+PREHOOK: Input: default@t1_mapping@ds=2011-10-13
+PREHOOK: Input: default@t1_n113
+PREHOOK: Input: default@t1_new_n0
+PREHOOK: Input: default@t1_old
+PREHOOK: Input: default@t1_old@ds=2011-10-13
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from t1_n113 where ds = '2011-10-13'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_mapping
+POSTHOOK: Input: default@t1_mapping@ds=2011-10-13
+POSTHOOK: Input: default@t1_n113
+POSTHOOK: Input: default@t1_new_n0
+POSTHOOK: Input: default@t1_old
+POSTHOOK: Input: default@t1_old@ds=2011-10-13
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -448,9 +462,21 @@ key4       value4  2011-10-14
 PREHOOK: query: explain extended
 select * from t1_n113 where ds = '2011-10-15'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1_mapping
+PREHOOK: Input: default@t1_n113
+PREHOOK: Input: default@t1_new_n0
+PREHOOK: Input: default@t1_new_n0@ds=2011-10-15
+PREHOOK: Input: default@t1_old
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from t1_n113 where ds = '2011-10-15'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1_mapping
+POSTHOOK: Input: default@t1_n113
+POSTHOOK: Input: default@t1_new_n0
+POSTHOOK: Input: default@t1_new_n0@ds=2011-10-15
+POSTHOOK: Input: default@t1_old
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/ptf.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/ptf.q.out 
b/ql/src/test/results/clientpositive/llap/ptf.q.out
index 13ea607..1d9487d 100644
--- a/ql/src/test/results/clientpositive/llap/ptf.q.out
+++ b/ql/src/test/results/clientpositive/llap/ptf.q.out
@@ -8,6 +8,8 @@ from noop(on part
   order by p_name
   )
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
@@ -18,6 +20,8 @@ from noop(on part
   order by p_name
   )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -185,6 +189,8 @@ from noop (on (select p1.* from part p1 join part p2 on 
p1.p_partkey = p2.p_part
 distribute by j.p_mfgr
 sort by j.p_name)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name,
 p_size, p_size - lag(p_size,1,p_size) over (partition by p_mfgr order by 
p_name) as deltaSz
@@ -192,6 +198,8 @@ from noop (on (select p1.* from part p1 join part p2 on 
p1.p_partkey = p2.p_part
 distribute by j.p_mfgr
 sort by j.p_name)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -377,12 +385,16 @@ from noop(on part
 partition by p_mfgr
 order by p_name)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size
 from noop(on part
 partition by p_mfgr
 order by p_name)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -497,6 +509,8 @@ from noop(on part
   order by p_name
   ) abc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
@@ -507,6 +521,8 @@ from noop(on part
   order by p_name
   ) abc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -677,6 +693,8 @@ from noop(on part
           order by p_name 
           )
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
@@ -687,6 +705,8 @@ from noop(on part
           order by p_name 
           )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -859,6 +879,8 @@ from noop(on part
           ) 
 group by p_mfgr, p_name, p_size
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
@@ -870,6 +892,8 @@ from noop(on part
           ) 
 group by p_mfgr, p_name, p_size
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1048,6 +1072,8 @@ partition by p_mfgr
 order by p_name 
 ) abc join part p1 on abc.p_partkey = p1.p_partkey
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select abc.* 
 from noop(on part 
@@ -1055,6 +1081,8 @@ partition by p_mfgr
 order by p_name 
 ) abc join part p1 on abc.p_partkey = p1.p_partkey
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1202,6 +1230,8 @@ partition by p_mfgr
 order by p_name 
 ) abc on abc.p_partkey = p1.p_partkey
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select abc.* 
 from part p1 join noop(on part 
@@ -1209,6 +1239,8 @@ partition by p_mfgr
 order by p_name 
 ) abc on abc.p_partkey = p1.p_partkey
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1360,6 +1392,8 @@ from noopwithmap(on part
 partition by p_mfgr
 order by p_name, p_size desc)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name, p_size desc) as r
@@ -1367,6 +1401,8 @@ from noopwithmap(on part
 partition by p_mfgr
 order by p_name, p_size desc)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1532,6 +1568,8 @@ from noopwithmap(on part
   partition by p_mfgr
   order by p_name)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
@@ -1541,6 +1579,8 @@ from noopwithmap(on part
   partition by p_mfgr
   order by p_name)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1725,6 +1765,8 @@ from noop(on part
 partition by p_mfgr
 order by p_name)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
@@ -1734,6 +1776,8 @@ from noop(on part
 partition by p_mfgr
 order by p_name)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1902,6 +1946,8 @@ partition by p_mfgr
 order by p_mfgr DESC, p_name
 )))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
@@ -1912,6 +1958,8 @@ partition by p_mfgr
 order by p_mfgr DESC, p_name
 )))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2144,6 +2192,8 @@ order by p_name)
 window w1 as (partition by p_mfgr order by p_name rows between 2 preceding and 
2 following) 
 ) sub1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, 
 sub1.cd, sub1.s1 
@@ -2157,6 +2207,8 @@ order by p_name)
 window w1 as (partition by p_mfgr order by p_name rows between 2 preceding and 
2 following) 
 ) sub1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2327,6 +2379,8 @@ partition by p_mfgr
 order by p_name 
 ) abc join part p1 on abc.p_partkey = p1.p_partkey
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select abc.p_mfgr, abc.p_name, 
 rank() over (distribute by abc.p_mfgr sort by abc.p_name) as r, 
@@ -2339,6 +2393,8 @@ partition by p_mfgr
 order by p_name 
 ) abc join part p1 on abc.p_partkey = p1.p_partkey
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2560,12 +2616,16 @@ from noop(on part
 partition by p_mfgr 
 order by p_name)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select DISTINCT p_mfgr, p_name, p_size 
 from noop(on part 
 partition by p_mfgr 
 order by p_name)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2717,6 +2777,9 @@ partition by p_mfgr
 order by p_mfgr)  
 window w1 as ( partition by p_mfgr order by p_brand rows between 2 preceding 
and current row)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@mfgr_price_view_n5
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_brand, s, 
 round(sum(s) over w1,2)  as s1
@@ -2725,6 +2788,9 @@ partition by p_mfgr
 order by p_mfgr)  
 window w1 as ( partition by p_mfgr order by p_brand rows between 2 preceding 
and current row)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@mfgr_price_view_n5
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2935,6 +3001,9 @@ cume_dist() over (distribute by p_mfgr sort by p_mfgr, 
p_name) as cud,
 first_value(p_size, true) over w1  as fv1
 window w1 as (distribute by p_mfgr sort by p_mfgr, p_name rows between 2 
preceding and 2 following)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+PREHOOK: Output: default@part_4_n2
+PREHOOK: Output: default@part_5_n2
 POSTHOOK: query: explain
 from noop(on part 
 partition by p_mfgr 
@@ -2951,6 +3020,9 @@ cume_dist() over (distribute by p_mfgr sort by p_mfgr, 
p_name) as cud,
 first_value(p_size, true) over w1  as fv1
 window w1 as (distribute by p_mfgr sort by p_mfgr, p_name rows between 2 
preceding and 2 following)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+POSTHOOK: Output: default@part_4_n2
+POSTHOOK: Output: default@part_5_n2
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2
@@ -3399,6 +3471,8 @@ from noop(on
         partition by p_mfgr,p_name  
         order by p_mfgr,p_name)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name) as r, 
@@ -3416,6 +3490,8 @@ from noop(on
         partition by p_mfgr,p_name  
         order by p_mfgr,p_name)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -3673,6 +3749,8 @@ from noop(on
         partition by p_mfgr  
         order by p_mfgr )
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
@@ -3690,6 +3768,8 @@ from noop(on
         partition by p_mfgr  
         order by p_mfgr )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -3942,6 +4022,8 @@ from noop(on
           partition by p_mfgr 
           order by p_mfgr))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
@@ -3957,6 +4039,8 @@ from noop(on
           partition by p_mfgr 
           order by p_mfgr))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -4186,6 +4270,8 @@ from noopwithmap(on
           partition by p_mfgr,p_name 
           order by p_mfgr,p_name)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name) as r, 
@@ -4203,6 +4289,8 @@ from noopwithmap(on
           partition by p_mfgr,p_name 
           order by p_mfgr,p_name)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -4473,6 +4561,8 @@ from noop(on
           order by p_mfgr
           ))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name order by p_mfgr,p_name) as r, 
@@ -4489,6 +4579,8 @@ from noop(on
           order by p_mfgr
           ))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -4734,6 +4826,8 @@ from noopwithmap(on
               order by p_mfgr, p_name) 
           ))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
@@ -4748,6 +4842,8 @@ from noopwithmap(on
               order by p_mfgr, p_name) 
           ))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@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/c39b5d1b/ql/src/test/results/clientpositive/llap/ptf_matchpath.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/ptf_matchpath.q.out 
b/ql/src/test/results/clientpositive/llap/ptf_matchpath.q.out
index c2a80fe..010ccc1 100644
--- a/ql/src/test/results/clientpositive/llap/ptf_matchpath.q.out
+++ b/ql/src/test/results/clientpositive/llap/ptf_matchpath.q.out
@@ -45,6 +45,8 @@ from matchpath(on
     arg4('origin_city_name, fl_num, year, month, day_of_month, size(tpath) as 
sz, tpath[0].day_of_month as tpath') 
    )
 PREHOOK: type: QUERY
+PREHOOK: Input: default@flights_tiny_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath 
 from matchpath(on 
@@ -56,6 +58,8 @@ from matchpath(on
     arg4('origin_city_name, fl_num, year, month, day_of_month, size(tpath) as 
sz, tpath[0].day_of_month as tpath') 
    )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@flights_tiny_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -173,6 +177,8 @@ from matchpath(on
    )
 where fl_num = 1142
 PREHOOK: type: QUERY
+PREHOOK: Input: default@flights_tiny_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath 
 from matchpath(on 
@@ -184,6 +190,8 @@ from matchpath(on
    )
 where fl_num = 1142
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@flights_tiny_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -292,6 +300,8 @@ from matchpath(on
     arg4('origin_city_name, fl_num, year, month, day_of_month, size(tpath) as 
sz, tpath[0].day_of_month as tpath')
    )
 PREHOOK: type: QUERY
+PREHOOK: Input: default@flights_tiny_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath
 from matchpath(on
@@ -302,6 +312,8 @@ from matchpath(on
     arg4('origin_city_name, fl_num, year, month, day_of_month, size(tpath) as 
sz, tpath[0].day_of_month as tpath')
    )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@flights_tiny_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/c39b5d1b/ql/src/test/results/clientpositive/llap/ptf_streaming.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/ptf_streaming.q.out 
b/ql/src/test/results/clientpositive/llap/ptf_streaming.q.out
index 3b3b13d..66dc679 100644
--- a/ql/src/test/results/clientpositive/llap/ptf_streaming.q.out
+++ b/ql/src/test/results/clientpositive/llap/ptf_streaming.q.out
@@ -8,6 +8,8 @@ from noopstreaming(on part
   order by p_name
   )
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
@@ -18,6 +20,8 @@ from noopstreaming(on part
   order by p_name
   )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -185,6 +189,8 @@ from noopstreaming (on (select p1.* from part p1 join part 
p2 on p1.p_partkey =
 distribute by j.p_mfgr
 sort by j.p_name)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name,
 p_size, p_size - lag(p_size,1,p_size) over (partition by p_mfgr order by 
p_name) as deltaSz
@@ -192,6 +198,8 @@ from noopstreaming (on (select p1.* from part p1 join part 
p2 on p1.p_partkey =
 distribute by j.p_mfgr
 sort by j.p_name)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -378,6 +386,8 @@ partition by p_mfgr
 order by p_name 
 ) abc join part p1 on abc.p_partkey = p1.p_partkey
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain 
 select abc.* 
 from noopstreaming(on part 
@@ -385,6 +395,8 @@ partition by p_mfgr
 order by p_name 
 ) abc join part p1 on abc.p_partkey = p1.p_partkey
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -532,6 +544,8 @@ from noopwithmapstreaming(on part
 partition by p_mfgr
 order by p_name, p_size desc)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name, p_size desc) as r
@@ -539,6 +553,8 @@ from noopwithmapstreaming(on part
 partition by p_mfgr
 order by p_name, p_size desc)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -704,6 +720,8 @@ from noopwithmapstreaming(on part
   partition by p_mfgr
   order by p_name)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,
@@ -713,6 +731,8 @@ from noopwithmapstreaming(on part
   partition by p_mfgr
   order by p_name)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -898,6 +918,8 @@ partition by p_mfgr
 order by p_mfgr, p_name
 )))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
@@ -908,6 +930,8 @@ partition by p_mfgr
 order by p_mfgr, p_name
 )))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1137,6 +1161,8 @@ partition by p_mfgr
 order by p_mfgr, p_name
 )))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
@@ -1147,6 +1173,8 @@ partition by p_mfgr
 order by p_mfgr, p_name
 )))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1376,6 +1404,8 @@ partition by p_mfgr
 order by p_mfgr, p_name
 )))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
@@ -1386,6 +1416,8 @@ partition by p_mfgr
 order by p_mfgr, p_name
 )))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1617,6 +1649,8 @@ partition by p_mfgr
 order by p_name 
 ) abc join part p1 on abc.p_partkey = p1.p_partkey
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select abc.p_mfgr, abc.p_name, 
 rank() over (distribute by abc.p_mfgr sort by abc.p_name) as r, 
@@ -1629,6 +1663,8 @@ partition by p_mfgr
 order by p_name 
 ) abc join part p1 on abc.p_partkey = p1.p_partkey
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1861,6 +1897,8 @@ from noopstreaming(on
         partition by p_mfgr,p_name  
         order by p_mfgr,p_name)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr,p_name) as r, 
@@ -1878,6 +1916,8 @@ from noopstreaming(on
         partition by p_mfgr,p_name  
         order by p_mfgr,p_name)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2135,6 +2175,8 @@ from noop(on
         partition by p_mfgr  
         order by p_mfgr )
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
@@ -2152,6 +2194,8 @@ from noop(on
         partition by p_mfgr  
         order by p_mfgr )
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2403,6 +2447,8 @@ from noopwithmapstreaming(on
               order by p_mfgr, p_name) 
           ))
 PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select p_mfgr, p_name,  
 rank() over (partition by p_mfgr order by p_name) as r, 
@@ -2417,6 +2463,8 @@ from noopwithmapstreaming(on
               order by p_mfgr, p_name) 
           ))
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@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/c39b5d1b/ql/src/test/results/clientpositive/llap/quotedid_smb.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/quotedid_smb.q.out 
b/ql/src/test/results/clientpositive/llap/quotedid_smb.q.out
index 13f2f9a..f836c47 100644
--- a/ql/src/test/results/clientpositive/llap/quotedid_smb.q.out
+++ b/ql/src/test/results/clientpositive/llap/quotedid_smb.q.out
@@ -46,10 +46,16 @@ PREHOOK: query: explain select a.`x+1`, a.`!@#$%^&*()_q`, 
b.`x+1`, b.`!@#$%^&*()
 from src_b a join src_b2 b on a.`!@#$%^&*()_q` = b.`!@#$%^&*()_q`
 where a.`x+1` < '11'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src_b
+PREHOOK: Input: default@src_b2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select a.`x+1`, a.`!@#$%^&*()_q`, b.`x+1`, 
b.`!@#$%^&*()_q`
 from src_b a join src_b2 b on a.`!@#$%^&*()_q` = b.`!@#$%^&*()_q`
 where a.`x+1` < '11'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_b
+POSTHOOK: Input: default@src_b2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/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/c39b5d1b/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 afdc8f8..da5feda 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/c39b5d1b/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

Reply via email to