http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/count.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/count.q.out 
b/ql/src/test/results/clientpositive/llap/count.q.out
index f253522..047d948 100644
--- a/ql/src/test/results/clientpositive/llap/count.q.out
+++ b/ql/src/test/results/clientpositive/llap/count.q.out
@@ -31,8 +31,12 @@ POSTHOOK: Input: default@abcd_n2
 NULL   35      23      6
 PREHOOK: query: explain select a, count(distinct b), count(distinct c), sum(d) 
from abcd_n2 group by a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select a, count(distinct b), count(distinct c), 
sum(d) from abcd_n2 group by a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -105,8 +109,12 @@ POSTHOOK: Input: default@abcd_n2
 NULL   1       1       6
 PREHOOK: query: explain select count(1), count(*), count(a), count(b), 
count(c), count(d), count(distinct a), count(distinct b), count(distinct c), 
count(distinct d), count(distinct a,b), count(distinct b,c), count(distinct 
c,d), count(distinct a,d), count(distinct a,c), count(distinct b,d), 
count(distinct a,b,c), count(distinct b,c,d), count(distinct a,c,d), 
count(distinct a,b,d), count(distinct a,b,c,d) from abcd_n2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(1), count(*), count(a), count(b), 
count(c), count(d), count(distinct a), count(distinct b), count(distinct c), 
count(distinct d), count(distinct a,b), count(distinct b,c), count(distinct 
c,d), count(distinct a,d), count(distinct a,c), count(distinct b,d), 
count(distinct a,b,c), count(distinct b,c,d), count(distinct a,c,d), 
count(distinct a,b,d), count(distinct a,b,c,d) from abcd_n2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -178,8 +186,12 @@ POSTHOOK: Input: default@abcd_n2
 7      7       6       6       6       7       3       3       6       7       
4       5       6       6       5       6       4       5       5       5       
4
 PREHOOK: query: explain select a, count(distinct b), count(distinct c), sum(d) 
from abcd_n2 group by a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select a, count(distinct b), count(distinct c), 
sum(d) from abcd_n2 group by a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -246,8 +258,12 @@ POSTHOOK: Input: default@abcd_n2
 NULL   1       1       6
 PREHOOK: query: explain select count(1), count(*), count(a), count(b), 
count(c), count(d), count(distinct a), count(distinct b), count(distinct c), 
count(distinct d), count(distinct a,b), count(distinct b,c), count(distinct 
c,d), count(distinct a,d), count(distinct a,c), count(distinct b,d), 
count(distinct a,b,c), count(distinct b,c,d), count(distinct a,c,d), 
count(distinct a,b,d), count(distinct a,b,c,d) from abcd_n2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(1), count(*), count(a), count(b), 
count(c), count(d), count(distinct a), count(distinct b), count(distinct c), 
count(distinct d), count(distinct a,b), count(distinct b,c), count(distinct 
c,d), count(distinct a,d), count(distinct a,c), count(distinct b,d), 
count(distinct a,b,c), count(distinct b,c,d), count(distinct a,c,d), 
count(distinct a,b,d), count(distinct a,b,c,d) from abcd_n2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -312,8 +328,12 @@ POSTHOOK: Input: default@abcd_n2
 7      7       6       6       6       7       3       3       6       7       
4       5       6       6       5       6       4       5       5       5       
4
 PREHOOK: query: explain select count(1), count(*), count(a), count(b), 
count(c), count(d), count(distinct a), count(distinct b), count(distinct c), 
count(distinct d), count(distinct a,b), count(distinct b,c), count(distinct 
c,d), count(distinct a,d), count(distinct a,c), count(distinct b,d), 
count(distinct a,b,c), count(distinct b,c,d), count(distinct a,c,d), 
count(distinct a,b,d), count(distinct a,b,c,d) from abcd_n2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(1), count(*), count(a), count(b), 
count(c), count(d), count(distinct a), count(distinct b), count(distinct c), 
count(distinct d), count(distinct a,b), count(distinct b,c), count(distinct 
c,d), count(distinct a,d), count(distinct a,c), count(distinct b,d), 
count(distinct a,b,c), count(distinct b,c,d), count(distinct a,c,d), 
count(distinct a,b,d), count(distinct a,b,c,d) from abcd_n2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -385,8 +405,12 @@ POSTHOOK: Input: default@abcd_n2
 7      7       6       6       6       7       3       3       6       7       
4       5       6       6       5       6       4       5       5       5       
4
 PREHOOK: query: explain select count(distinct b) from abcd_n2 group by a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(distinct b) from abcd_n2 group by a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -471,8 +495,12 @@ POSTHOOK: Input: default@abcd_n2
 2
 PREHOOK: query: explain select count(distinct b) from abcd_n2 group by b
 PREHOOK: type: QUERY
+PREHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(distinct b) from abcd_n2 group by b
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -556,8 +584,12 @@ POSTHOOK: Input: default@abcd_n2
 1
 PREHOOK: query: explain select count(distinct b) from abcd_n2 group by c
 PREHOOK: type: QUERY
+PREHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(distinct b) from abcd_n2 group by c
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -645,8 +677,12 @@ POSTHOOK: Input: default@abcd_n2
 1
 PREHOOK: query: explain select count(b), count(distinct c) from abcd_n2 group 
by d
 PREHOOK: type: QUERY
+PREHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(b), count(distinct c) from abcd_n2 group 
by d
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -720,8 +756,12 @@ POSTHOOK: Input: default@abcd_n2
 1      1
 PREHOOK: query: explain select a, count(distinct b), count(distinct c), 
sum(d), sum(d+d), sum(d*3), sum(b), sum(c), sum(a), sum(distinct a), 
sum(distinct b) from abcd_n2 group by a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select a, count(distinct b), count(distinct c), 
sum(d), sum(d+d), sum(d*3), sum(b), sum(c), sum(a), sum(distinct a), 
sum(distinct b) from abcd_n2 group by a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -788,8 +828,12 @@ POSTHOOK: Input: default@abcd_n2
 NULL   1       1       6       12      18      35      23      NULL    NULL    
35
 PREHOOK: query: explain select a, count(distinct b), count(distinct c), 
sum(d), sum(c) from abcd_n2 group by a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select a, count(distinct b), count(distinct c), 
sum(d), sum(c) from abcd_n2 group by a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -856,8 +900,12 @@ POSTHOOK: Input: default@abcd_n2
 NULL   1       1       6       23
 PREHOOK: query: explain select count(1), count(*), count(a), count(b), 
count(c), count(d), count(distinct a), count(distinct b), count(distinct c), 
count(distinct d), count(distinct a,b), count(distinct b,c), count(distinct 
c,d), count(distinct a,d), count(distinct a,c), count(distinct b,d), 
count(distinct a,b,c), count(distinct b,c,d), count(distinct a,c,d), 
count(distinct a,b,d), count(distinct a,b,c,d) from abcd_n2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(1), count(*), count(a), count(b), 
count(c), count(d), count(distinct a), count(distinct b), count(distinct c), 
count(distinct d), count(distinct a,b), count(distinct b,c), count(distinct 
c,d), count(distinct a,d), count(distinct a,c), count(distinct b,d), 
count(distinct a,b,c), count(distinct b,c,d), count(distinct a,c,d), 
count(distinct a,b,d), count(distinct a,b,c,d) from abcd_n2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@abcd_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/count_dist_rewrite.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/count_dist_rewrite.q.out 
b/ql/src/test/results/clientpositive/llap/count_dist_rewrite.q.out
index a23a55c..064ba6a 100644
--- a/ql/src/test/results/clientpositive/llap/count_dist_rewrite.q.out
+++ b/ql/src/test/results/clientpositive/llap/count_dist_rewrite.q.out
@@ -1,7 +1,11 @@
 PREHOOK: query: explain select count(distinct key) from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(distinct 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
@@ -86,8 +90,12 @@ POSTHOOK: Input: default@src
 309
 PREHOOK: query: explain select max(key), count(distinct key) B1_CNTD from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select max(key), count(distinct key) B1_CNTD 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
@@ -175,8 +183,12 @@ POSTHOOK: Input: default@src
 98     309
 PREHOOK: query: explain select max(key), count(distinct key), min(key) from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select max(key), count(distinct key), min(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
@@ -264,8 +276,12 @@ POSTHOOK: Input: default@src
 98     309     0
 PREHOOK: query: explain select max(key), count(distinct key), min(key), 
avg(key) from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select max(key), count(distinct key), min(key), 
avg(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
@@ -357,8 +373,12 @@ POSTHOOK: Input: default@src
 98     309     0       260.182
 PREHOOK: query: explain select count(1), count(distinct key) from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(1), count(distinct 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
@@ -452,6 +472,8 @@ PREHOOK: query: explain select
   max(key) as max_ss_promo_sk
 from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select 
   count(*) as total,
   count(key) as not_null_total,
@@ -460,6 +482,8 @@ POSTHOOK: query: explain select
   max(key) as max_ss_promo_sk
 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
@@ -559,8 +583,12 @@ POSTHOOK: Input: default@src
 500    500     309     val_98  98
 PREHOOK: query: explain select count(1), count(distinct key), cast(STDDEV(key) 
as int) from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select count(1), count(distinct key), 
cast(STDDEV(key) as int) 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
@@ -670,6 +698,8 @@ PREHOOK: query: explain SELECT
   cast(variance(substr(src.value,5)) as int),
   cast(var_samp(substr(src.value,5)) as int)  from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain SELECT
   sum(substr(src.value,5)),
   avg(substr(src.value,5)),
@@ -681,6 +711,8 @@ POSTHOOK: query: explain SELECT
   cast(variance(substr(src.value,5)) as int),
   cast(var_samp(substr(src.value,5)) as int)  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
@@ -790,8 +822,12 @@ POSTHOOK: Input: default@src
 130091.0       260.182 309     98      0       142     143     20428   20469
 PREHOOK: query: explain select max(key), count(distinct key), min(key), 
avg(key) from src group by value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select max(key), count(distinct key), min(key), 
avg(key) from src group by value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/cross_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cross_join.q.out 
b/ql/src/test/results/clientpositive/llap/cross_join.q.out
index 64f669b..9aece5f 100644
--- a/ql/src/test/results/clientpositive/llap/cross_join.q.out
+++ b/ql/src/test/results/clientpositive/llap/cross_join.q.out
@@ -1,8 +1,12 @@
 Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: explain select src.key from src join src src2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src.key from src join src src2
 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
@@ -70,8 +74,12 @@ STAGE PLANS:
 Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: explain select src.key from src cross join src src2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src.key from src cross join src src2
 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
@@ -138,8 +146,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select src.key from src cross join src src2 on 
src.key=src2.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src.key from src cross join src src2 on 
src.key=src2.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
@@ -218,8 +230,12 @@ STAGE PLANS:
 Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: explain select src.key from src join src src2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src.key from src join src src2
 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
@@ -287,8 +303,12 @@ STAGE PLANS:
 Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: explain select src.key from src cross join src src2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src.key from src cross join src src2
 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
@@ -355,8 +375,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select src.key from src cross join src src2 on 
src.key=src2.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain select src.key from src cross join src src2 on 
src.key=src2.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/c39b5d1b/ql/src/test/results/clientpositive/llap/cross_prod_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cross_prod_1.q.out 
b/ql/src/test/results/clientpositive/llap/cross_prod_1.q.out
index 13c9965..a8f6cc9 100644
--- a/ql/src/test/results/clientpositive/llap/cross_prod_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/cross_prod_1.q.out
@@ -15,8 +15,12 @@ POSTHOOK: Lineage: x_n0.value SIMPLE 
[(src)src.FieldSchema(name:value, type:stri
 Warning: Shuffle Join MERGEJOIN[11][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: explain select * from X_n0 as A, X_n0 as B order by A.key, 
B.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@x_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from X_n0 as A, X_n0 as B order by A.key, 
B.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@x_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -209,8 +213,12 @@ POSTHOOK: Input: default@x_n0
 Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: explain select * from X_n0 as A join X_n0 as B on A.key<B.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@x_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from X_n0 as A join X_n0 as B on A.key<B.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@x_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -336,8 +344,12 @@ POSTHOOK: Input: default@x_n0
 Warning: Shuffle Join MERGEJOIN[11][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: explain select * from X_n0 as A join X_n0 as B on A.key 
between "103" and "105"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@x_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from X_n0 as A join X_n0 as B on A.key 
between "103" and "105"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@x_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -450,8 +462,12 @@ POSTHOOK: Input: default@x_n0
 Warning: Shuffle Join MERGEJOIN[12][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in 
Stage 'Reducer 2' is a cross product
 PREHOOK: query: explain select * from X_n0 as A, X_n0 as B, X_n0 as C
 PREHOOK: type: QUERY
+PREHOOK: Input: default@x_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from X_n0 as A, X_n0 as B, X_n0 as C
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@x_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1552,8 +1568,12 @@ POSTHOOK: Input: default@x_n0
 Warning: Shuffle Join MERGEJOIN[11][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: explain select * from X_n0 as A join X_n0 as B on A.key in 
("103", "104", "105")
 PREHOOK: type: QUERY
+PREHOOK: Input: default@x_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from X_n0 as A join X_n0 as B on A.key in 
("103", "104", "105")
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@x_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1666,8 +1686,12 @@ POSTHOOK: Input: default@x_n0
 Warning: Shuffle Join MERGEJOIN[13][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: explain select A.key, count(*)  from X_n0 as A, X_n0 as B 
group by A.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@x_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select A.key, count(*)  from X_n0 as A, X_n0 as B 
group by A.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@x_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1776,8 +1800,12 @@ POSTHOOK: Input: default@x_n0
 Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: explain select * from X_n0 as A left outer join X_n0 as B on 
(A.key = B.key or A.value between "val_103" and "val_105")
 PREHOOK: type: QUERY
+PREHOOK: Input: default@x_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from X_n0 as A left outer join X_n0 as B on 
(A.key = B.key or A.value between "val_103" and "val_105")
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@x_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1849,8 +1877,12 @@ STAGE PLANS:
 Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: explain select * from X_n0 as A right outer join X_n0 as B on 
(A.key = B.key or A.value between "val_103" and "val_105")
 PREHOOK: type: QUERY
+PREHOOK: Input: default@x_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from X_n0 as A right outer join X_n0 as B on 
(A.key = B.key or A.value between "val_103" and "val_105")
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@x_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1922,8 +1954,12 @@ STAGE PLANS:
 Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: explain select * from X_n0 as A full outer join X_n0 as B on 
(A.key = B.key or A.value between "val_103" and "val_105")
 PREHOOK: type: QUERY
+PREHOOK: Input: default@x_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from X_n0 as A full outer join X_n0 as B on 
(A.key = B.key or A.value between "val_103" and "val_105")
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@x_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1995,8 +2031,12 @@ STAGE PLANS:
 Warning: Shuffle Join MERGEJOIN[17][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 3' is a cross product
 PREHOOK: query: explain select * from (select X_n0.key, count(*) from X_n0 
group by X_n0.key) as A, (select X_n0.key, count(*) from X_n0 group by 
X_n0.key) as B
 PREHOOK: type: QUERY
+PREHOOK: Input: default@x_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from (select X_n0.key, count(*) from X_n0 
group by X_n0.key) as A, (select X_n0.key, count(*) from X_n0 group by 
X_n0.key) as B
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@x_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2203,8 +2243,12 @@ POSTHOOK: Input: default@x_n0
 Warning: Shuffle Join MERGEJOIN[13][tables = [$hdt$_1]] in Stage 'Reducer 3' 
is a cross product
 PREHOOK: query: explain select * from (select * from X_n0 union all select * 
from X_n0 as y) a join X_n0
 PREHOOK: type: QUERY
+PREHOOK: Input: default@x_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from (select * from X_n0 union all select * 
from X_n0 as y) a join X_n0
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@x_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/cross_prod_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cross_prod_3.q.out 
b/ql/src/test/results/clientpositive/llap/cross_prod_3.q.out
index 87991c2..7298a67 100644
--- a/ql/src/test/results/clientpositive/llap/cross_prod_3.q.out
+++ b/ql/src/test/results/clientpositive/llap/cross_prod_3.q.out
@@ -32,8 +32,14 @@ POSTHOOK: Lineage: y_n0.key SIMPLE 
[(src)src.FieldSchema(name:key, type:string,
 POSTHOOK: Lineage: y_n0.value SIMPLE [(src)src.FieldSchema(name:value, 
type:string, comment:default), ]
 PREHOOK: query: explain select * from Y_n0, (select * from X_n2 as A join X_n2 
as B on A.key=B.key) as C where Y_n0.key=C.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@x_n2
+PREHOOK: Input: default@y_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from Y_n0, (select * from X_n2 as A join 
X_n2 as B on A.key=B.key) as C where Y_n0.key=C.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@x_n2
+POSTHOOK: Input: default@y_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/cross_prod_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cross_prod_4.q.out 
b/ql/src/test/results/clientpositive/llap/cross_prod_4.q.out
index 4dd771f..910976f 100644
--- a/ql/src/test/results/clientpositive/llap/cross_prod_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/cross_prod_4.q.out
@@ -15,8 +15,12 @@ POSTHOOK: Lineage: x_n1.value SIMPLE 
[(src)src.FieldSchema(name:value, type:stri
 Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: explain select * from X_n1 as A, X_n1 as B
 PREHOOK: type: QUERY
+PREHOOK: Input: default@x_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from X_n1 as A, X_n1 as B
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@x_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/c39b5d1b/ql/src/test/results/clientpositive/llap/cross_product_check_1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/cross_product_check_1.q.out 
b/ql/src/test/results/clientpositive/llap/cross_product_check_1.q.out
index b1a44b0..5c8ac89 100644
--- a/ql/src/test/results/clientpositive/llap/cross_product_check_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/cross_product_check_1.q.out
@@ -31,8 +31,14 @@ POSTHOOK: Lineage: b_n6.value SIMPLE 
[(src)src.FieldSchema(name:value, type:stri
 Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: explain select * from A_n8 join B_n6
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n8
+PREHOOK: Input: default@b_n6
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from A_n8 join B_n6
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n8
+POSTHOOK: Input: default@b_n6
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -103,8 +109,14 @@ STAGE PLANS:
 Warning: Shuffle Join MERGEJOIN[21][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in 
Stage 'Reducer 3' is a cross product
 PREHOOK: query: explain select * from B_n6 d1 join B_n6 d2 on d1.key = d2.key 
join A_n8
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n8
+PREHOOK: Input: default@b_n6
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from B_n6 d1 join B_n6 d2 on d1.key = d2.key 
join A_n8
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n8
+POSTHOOK: Input: default@b_n6
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -219,11 +231,17 @@ PREHOOK: query: explain select * from A_n8 join
           from B_n6 d1 join B_n6 d2 on d1.key = d2.key
           where 1 = 1 group by d1.key) od1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n8
+PREHOOK: Input: default@b_n6
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from A_n8 join 
          (select d1.key 
           from B_n6 d1 join B_n6 d2 on d1.key = d2.key
           where 1 = 1 group by d1.key) od1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n8
+POSTHOOK: Input: default@b_n6
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -353,8 +371,14 @@ Warning: Shuffle Join MERGEJOIN[19][tables = [$hdt$_1, 
$hdt$_2]] in Stage 'Reduc
 Warning: Shuffle Join MERGEJOIN[20][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: explain select * from A_n8 join (select d1.key from B_n6 d1 
join B_n6 d2 where 1 = 1  group by d1.key) od1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n8
+PREHOOK: Input: default@b_n6
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from A_n8 join (select d1.key from B_n6 d1 
join B_n6 d2 where 1 = 1  group by d1.key) od1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n8
+POSTHOOK: Input: default@b_n6
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -474,10 +498,16 @@ PREHOOK: query: explain select * from
 (select A_n8.key from A_n8  group by key) ss join
 (select d1.key from B_n6 d1 join B_n6 d2 on d1.key = d2.key where 1 = 1 group 
by d1.key) od1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n8
+PREHOOK: Input: default@b_n6
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from 
 (select A_n8.key from A_n8  group by key) ss join
 (select d1.key from B_n6 d1 join B_n6 d2 on d1.key = d2.key where 1 = 1 group 
by d1.key) od1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n8
+POSTHOOK: Input: default@b_n6
+#### 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/cross_product_check_2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/cross_product_check_2.q.out 
b/ql/src/test/results/clientpositive/llap/cross_product_check_2.q.out
index 221bff1..fa66659 100644
--- a/ql/src/test/results/clientpositive/llap/cross_product_check_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/cross_product_check_2.q.out
@@ -31,8 +31,14 @@ POSTHOOK: Lineage: b_n2.value SIMPLE 
[(src)src.FieldSchema(name:value, type:stri
 Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: explain select * from A_n2 join B_n2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n2
+PREHOOK: Input: default@b_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from A_n2 join B_n2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n2
+POSTHOOK: Input: default@b_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -103,8 +109,14 @@ STAGE PLANS:
 Warning: Shuffle Join MERGEJOIN[21][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in 
Stage 'Reducer 2' is a cross product
 PREHOOK: query: explain select * from B_n2 d1 join B_n2 d2 on d1.key = d2.key 
join A_n2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n2
+PREHOOK: Input: default@b_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from B_n2 d1 join B_n2 d2 on d1.key = d2.key 
join A_n2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n2
+POSTHOOK: Input: default@b_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -212,11 +224,17 @@ PREHOOK: query: explain select * from A_n2 join
           from B_n2 d1 join B_n2 d2 on d1.key = d2.key 
           where 1 = 1 group by d1.key) od1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n2
+PREHOOK: Input: default@b_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from A_n2 join 
          (select d1.key 
           from B_n2 d1 join B_n2 d2 on d1.key = d2.key 
           where 1 = 1 group by d1.key) od1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n2
+POSTHOOK: Input: default@b_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -340,8 +358,14 @@ Warning: Shuffle Join MERGEJOIN[19][tables = [$hdt$_1, 
$hdt$_2]] in Stage 'Reduc
 Warning: Shuffle Join MERGEJOIN[20][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: explain select * from A_n2 join (select d1.key from B_n2 d1 
join B_n2 d2 where 1 = 1 group by d1.key) od1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n2
+PREHOOK: Input: default@b_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from A_n2 join (select d1.key from B_n2 d1 
join B_n2 d2 where 1 = 1 group by d1.key) od1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n2
+POSTHOOK: Input: default@b_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -461,10 +485,16 @@ PREHOOK: query: explain select * from
 (select A_n2.key from A_n2 group by key) ss join 
 (select d1.key from B_n2 d1 join B_n2 d2 on d1.key = d2.key where 1 = 1 group 
by d1.key) od1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@a_n2
+PREHOOK: Input: default@b_n2
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from 
 (select A_n2.key from A_n2 group by key) ss join 
 (select d1.key from B_n2 d1 join B_n2 d2 on d1.key = d2.key where 1 = 1 group 
by d1.key) od1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@a_n2
+POSTHOOK: Input: default@b_n2
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/ctas.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/ctas.q.out 
b/ql/src/test/results/clientpositive/llap/ctas.q.out
index 729a6c7..2504b6a 100644
--- a/ql/src/test/results/clientpositive/llap/ctas.q.out
+++ b/ql/src/test/results/clientpositive/llap/ctas.q.out
@@ -16,8 +16,14 @@ POSTHOOK: Input: default@nzhang_tmp
 #### A masked pattern was here ####
 PREHOOK: query: explain create table nzhang_CTAS1 as select key k, value from 
src sort by k, value limit 10
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@nzhang_CTAS1
 POSTHOOK: query: explain create table nzhang_CTAS1 as select key k, value from 
src sort by k, value limit 10
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@nzhang_CTAS1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -173,8 +179,14 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain create table nzhang_ctas2 as select * from src sort by 
key, value limit 10
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@nzhang_ctas2
 POSTHOOK: query: explain create table nzhang_ctas2 as select * from src sort 
by key, value limit 10
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@nzhang_ctas2
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -330,8 +342,14 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain create table nzhang_ctas3 row format serde 
"org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe" stored as RCFile as 
select key/2 half_key, concat(value, "_con") conb  from src sort by half_key, 
conb limit 10
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@nzhang_ctas3
 POSTHOOK: query: explain create table nzhang_ctas3 row format serde 
"org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe" stored as RCFile as 
select key/2 half_key, concat(value, "_con") conb  from src sort by half_key, 
conb limit 10
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@nzhang_ctas3
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -551,8 +569,14 @@ Storage Desc Params:
        serialization.format    1                   
 PREHOOK: query: explain create table nzhang_ctas4 row format delimited fields 
terminated by ',' stored as textfile as select key, value from src sort by key, 
value limit 10
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@nzhang_ctas4
 POSTHOOK: query: explain create table nzhang_ctas4 row format delimited fields 
terminated by ',' stored as textfile as select key, value from src sort by key, 
value limit 10
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@nzhang_ctas4
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -710,8 +734,14 @@ Storage Desc Params:
        serialization.format    ,                   
 PREHOOK: query: explain create table nzhang_ctas5 row format delimited fields 
terminated by ',' lines terminated by '\012' stored as textfile as select key, 
value from src sort by key, value limit 10
 PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@src
+PREHOOK: Output: database:default
+PREHOOK: Output: default@nzhang_ctas5
 POSTHOOK: query: explain create table nzhang_ctas5 row format delimited fields 
terminated by ',' lines terminated by '\012' stored as textfile as select key, 
value from src sort by key, value limit 10
 POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@src
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@nzhang_ctas5
 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/cte_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cte_1.q.out 
b/ql/src/test/results/clientpositive/llap/cte_1.q.out
index d98862c..360d110 100644
--- a/ql/src/test/results/clientpositive/llap/cte_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/cte_1.q.out
@@ -3,11 +3,15 @@ with q1 as ( select key from src where key = '5')
 select *
 from q1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as ( select key from src where key = '5')
 select *
 from q1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -44,10 +48,14 @@ PREHOOK: query: explain
 with q1 as ( select key from src where key = '5')
 select * from (select key from q1) a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as ( select key from src where key = '5')
 select * from (select key from q1) a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -83,11 +91,15 @@ with q1 as ( select key from q2 where key = '5'),
 q2 as ( select key from src where key = '5')
 select * from (select key from q1) a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as ( select key from q2 where key = '5'),
 q2 as ( select key from src where key = '5')
 select * from (select key from q1) a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### 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/cte_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cte_3.q.out 
b/ql/src/test/results/clientpositive/llap/cte_3.q.out
index ec5d001..16b398c 100644
--- a/ql/src/test/results/clientpositive/llap/cte_3.q.out
+++ b/ql/src/test/results/clientpositive/llap/cte_3.q.out
@@ -3,11 +3,15 @@ with q1 as ( select key from src where key = '5')
 select *
 from q1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@q1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as ( select key from src where key = '5')
 select *
 from q1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@q1
+#### A masked pattern was here ####
 Plan optimized by CBO.
 
 Stage-2
@@ -58,10 +62,14 @@ PREHOOK: query: explain
 with q1 as ( select key from src where key = '5')
 select * from (select key from q1) a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@q1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as ( select key from src where key = '5')
 select * from (select key from q1) a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@q1
+#### A masked pattern was here ####
 Plan optimized by CBO.
 
 Stage-2
@@ -111,11 +119,15 @@ with q1 as ( select key from q2 where key = '5'),
 q2 as ( select key from src where key = '5')
 select * from (select key from q1) a
 PREHOOK: type: QUERY
+PREHOOK: Input: default@q1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as ( select key from q2 where key = '5'),
 q2 as ( select key from src where key = '5')
 select * from (select key from q1) a
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@q1
+#### A masked pattern was here ####
 Plan optimized by CBO.
 
 Stage-5

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/cte_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cte_5.q.out 
b/ql/src/test/results/clientpositive/llap/cte_5.q.out
index cedf9d6..5deaa6c 100644
--- a/ql/src/test/results/clientpositive/llap/cte_5.q.out
+++ b/ql/src/test/results/clientpositive/llap/cte_5.q.out
@@ -70,12 +70,18 @@ select a.colnum
 from mydb.q1_n0 as a join q1_n0 as b
 on a.colnum=b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: mydb@q1_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1_n0 as (select * from src where key= '5')
 select a.colnum
 from mydb.q1_n0 as a join q1_n0 as b
 on a.colnum=b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: mydb@q1_n0
+#### A masked pattern was here ####
 Plan optimized by CBO.
 
 Vertex dependency in root stage

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/cte_mat_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cte_mat_1.q.out 
b/ql/src/test/results/clientpositive/llap/cte_mat_1.q.out
index 87cbcae..bf8a1a7 100644
--- a/ql/src/test/results/clientpositive/llap/cte_mat_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/cte_mat_1.q.out
@@ -5,12 +5,16 @@ select a.key
 from q1 a join q1 b
 on a.key=b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as (select * from src where key= '5')
 select a.key
 from q1 a join q1 b
 on a.key=b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 Plan optimized by CBO.
 
 Vertex dependency in root stage

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/cte_mat_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cte_mat_2.q.out 
b/ql/src/test/results/clientpositive/llap/cte_mat_2.q.out
index 87cbcae..bf8a1a7 100644
--- a/ql/src/test/results/clientpositive/llap/cte_mat_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/cte_mat_2.q.out
@@ -5,12 +5,16 @@ select a.key
 from q1 a join q1 b
 on a.key=b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as (select * from src where key= '5')
 select a.key
 from q1 a join q1 b
 on a.key=b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
 Plan optimized by CBO.
 
 Vertex dependency in root stage

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/cte_mat_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cte_mat_3.q.out 
b/ql/src/test/results/clientpositive/llap/cte_mat_3.q.out
index d5efe61..b7d8f24 100644
--- a/ql/src/test/results/clientpositive/llap/cte_mat_3.q.out
+++ b/ql/src/test/results/clientpositive/llap/cte_mat_3.q.out
@@ -4,12 +4,16 @@ select a.key
 from q1 a join q1 b
 on a.key=b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@q1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as (select * from src where key= '5')
 select a.key
 from q1 a join q1 b
 on a.key=b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@q1
+#### A masked pattern was here ####
 Plan optimized by CBO.
 
 Vertex dependency in Stage-4

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/cte_mat_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cte_mat_4.q.out 
b/ql/src/test/results/clientpositive/llap/cte_mat_4.q.out
index 9ef3402..3472ceb 100644
--- a/ql/src/test/results/clientpositive/llap/cte_mat_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/cte_mat_4.q.out
@@ -45,12 +45,16 @@ select a.key
 from q1 a join q1 b
 on a.key=b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@q1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as (select * from src where key= '5')
 select a.key
 from q1 a join q1 b
 on a.key=b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@q1
+#### A masked pattern was here ####
 Plan optimized by CBO.
 
 Vertex dependency in Stage-4
@@ -195,12 +199,16 @@ select a.key
 from q1 a join q1 b
 on a.key=b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@q1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as (select * from src where key= '5')
 select a.key
 from q1 a join q1 b
 on a.key=b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@q1
+#### A masked pattern was here ####
 Plan optimized by CBO.
 
 Vertex dependency in Stage-4

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/cte_mat_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cte_mat_5.q.out 
b/ql/src/test/results/clientpositive/llap/cte_mat_5.q.out
index ec6bfe6..2d1222f 100644
--- a/ql/src/test/results/clientpositive/llap/cte_mat_5.q.out
+++ b/ql/src/test/results/clientpositive/llap/cte_mat_5.q.out
@@ -69,12 +69,18 @@ select a.colnum
 from mydb.q1 as a join q1 as b
 on a.colnum=b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@q1
+PREHOOK: Input: mydb@q1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 with q1 as (select * from src where key= '5')
 select a.colnum
 from mydb.q1 as a join q1 as b
 on a.colnum=b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@q1
+POSTHOOK: Input: mydb@q1
+#### A masked pattern was here ####
 Plan optimized by CBO.
 
 Vertex dependency in Stage-4

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/current_date_timestamp.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/current_date_timestamp.q.out 
b/ql/src/test/results/clientpositive/llap/current_date_timestamp.q.out
index 083aab3..9563c05 100644
--- a/ql/src/test/results/clientpositive/llap/current_date_timestamp.q.out
+++ b/ql/src/test/results/clientpositive/llap/current_date_timestamp.q.out
@@ -41,8 +41,12 @@ POSTHOOK: Input: default@src
 1
 PREHOOK: query: explain extended select current_timestamp() from alltypesorc
 PREHOOK: type: QUERY
+PREHOOK: Input: default@alltypesorc
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended select current_timestamp() from alltypesorc
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@alltypesorc
+#### 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/dec_str.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/dec_str.q.out 
b/ql/src/test/results/clientpositive/llap/dec_str.q.out
index d021433..b491afd 100644
--- a/ql/src/test/results/clientpositive/llap/dec_str.q.out
+++ b/ql/src/test/results/clientpositive/llap/dec_str.q.out
@@ -8,8 +8,12 @@ POSTHOOK: Output: database:default
 POSTHOOK: Output: default@t1
 PREHOOK: query: explain select * from t1 where a = '22.3'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from t1 where a = '22.3'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -29,8 +33,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from t1 where a = '2.3'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from t1 where a = '2.3'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -50,8 +58,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from t1 where a = '213.223'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from t1 where a = '213.223'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -71,8 +83,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from t1 where a = ''
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from t1 where a = ''
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -92,8 +108,12 @@ STAGE PLANS:
 
 PREHOOK: query: explain select * from t1 where a = 'ab'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@t1
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from t1 where a = 'ab'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1
+#### 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/default_constraint.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/default_constraint.q.out 
b/ql/src/test/results/clientpositive/llap/default_constraint.q.out
index f93eb1f..e15f2c6 100644
--- a/ql/src/test/results/clientpositive/llap/default_constraint.q.out
+++ b/ql/src/test/results/clientpositive/llap/default_constraint.q.out
@@ -71,8 +71,12 @@ Column Name:a        Default Value:127Y
                 
 PREHOOK: query: EXPLAIN INSERT INTO numericDataType_n1(a) values(3Y)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@numericdatatype_n1
 POSTHOOK: query: EXPLAIN INSERT INTO numericDataType_n1(a) values(3Y)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@numericdatatype_n1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -166,8 +170,12 @@ POSTHOOK: Input: default@numericdatatype_n1
 3      32767   2147483647      9223372036854775807     3.4E38  1234567.89
 PREHOOK: query: EXPLAIN INSERT INTO numericDataType_n1(e,f) values(4.5, 678.4)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@numericdatatype_n1
 POSTHOOK: query: EXPLAIN INSERT INTO numericDataType_n1(e,f) values(4.5, 678.4)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@numericdatatype_n1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -337,8 +345,12 @@ Column Name:t              Default 
Value:TIMESTAMP'2016-02-22 12:45:07.000000000'
                 
 PREHOOK: query: EXPLAIN INSERT INTO table1_n16(t) values ("1985-12-31 
12:45:07")
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@table1_n16
 POSTHOOK: query: EXPLAIN INSERT INTO table1_n16(t) values ("1985-12-31 
12:45:07")
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@table1_n16
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -414,8 +426,12 @@ POSTHOOK: Input: default@table1_n16
 2018-02-14     1985-12-31 12:45:07     2016-01-03 12:26:34.0 US/Pacific        
true    NULL
 PREHOOK: query: EXPLAIN INSERT INTO table1_n16(d, t1) values ("1985-12-31", 
'2018-02-27 17:32:14.259')
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@table1_n16
 POSTHOOK: query: EXPLAIN INSERT INTO table1_n16(d, t1) values ("1985-12-31", 
'2018-02-27 17:32:14.259')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@table1_n16
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -569,8 +585,12 @@ Column Name:v              Default 
Value:cast('varchar_default_value' as varchar(350))
                 
 PREHOOK: query: EXPLAIN INSERT INTO table2_n11(i) values('default')
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@table2_n11
 POSTHOOK: query: EXPLAIN INSERT INTO table2_n11(i) values('default')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@table2_n11
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -663,8 +683,12 @@ POSTHOOK: Input: default@table2_n11
 default        true    Current_User()  varchar_default_value   char_value      
    
 PREHOOK: query: EXPLAIN INSERT INTO table2_n11(v, c) 
values('varchar_default2', 'char')
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@table2_n11
 POSTHOOK: query: EXPLAIN INSERT INTO table2_n11(v, c) 
values('varchar_default2', 'char')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@table2_n11
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -819,8 +843,12 @@ Column Name:b1             Default Value:cast('bin' as 
binary)
                 
 PREHOOK: query: EXPLAIN INSERT INTO misc(b) values(false)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@misc
 POSTHOOK: query: EXPLAIN INSERT INTO misc(b) values(false)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@misc
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -910,8 +938,12 @@ POSTHOOK: Input: default@misc
 false  bin
 PREHOOK: query: EXPLAIN INSERT INTO misc(b1) values('011')
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@misc
 POSTHOOK: query: EXPLAIN INSERT INTO misc(b1) values('011')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@misc
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -1125,8 +1157,12 @@ Column Name:ts           Default Value:cast('2016-01-01 
12:01:01' as timestamp)
                 
 PREHOOK: query: EXPLAIN INSERT INTO t11_n2(c4) values('vi')
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@t11_n2
 POSTHOOK: query: EXPLAIN INSERT INTO t11_n2(c4) values('vi')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@t11_n2
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -1211,8 +1247,12 @@ POSTHOOK: Input: default@t11_n2
 2016-01-01 12:01:01    2016-01-03 12:26:34.0 US/Pacific        4.50    true    
5       45      45.4    567     88      false   true    5.0     vi
 PREHOOK: query: EXPLAIN INSERT INTO t11_n2(b1,c4) values(true,'ga')
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@t11_n2
 POSTHOOK: query: EXPLAIN INSERT INTO t11_n2(b1,c4) values(true,'ga')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@t11_n2
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -1378,8 +1418,12 @@ Column Name:f            Default Value:1234567.89
                 
 PREHOOK: query: EXPLAIN INSERT INTO numericDataType_n1(b) values(456)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@numericdatatype_n1
 POSTHOOK: query: EXPLAIN INSERT INTO numericDataType_n1(b) values(456)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@numericdatatype_n1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -1542,8 +1586,12 @@ Column Name:f            Default Value:1234567.89
                 
 PREHOOK: query: EXPLAIN INSERT INTO numericDataType_n1(b) values(56)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@numericdatatype_n1
 POSTHOOK: query: EXPLAIN INSERT INTO numericDataType_n1(b) values(56)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@numericdatatype_n1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -1801,8 +1849,12 @@ Column Name:a            Default Value:127Y
                 
 PREHOOK: query: EXPLAIN INSERT INTO numericDataType_n1(f) values(847.45)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@numericdatatype_n1
 POSTHOOK: query: EXPLAIN INSERT INTO numericDataType_n1(f) values(847.45)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@numericdatatype_n1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -2137,8 +2189,12 @@ Column Name:a            Default Value:108Y
                 
 PREHOOK: query: EXPLAIN INSERT INTO numericDataType_n1(f) values(847.45)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@numericdatatype_n1
 POSTHOOK: query: EXPLAIN INSERT INTO numericDataType_n1(f) values(847.45)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@numericdatatype_n1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -2294,8 +2350,12 @@ Column Name:j            Default 
Value:'12345678901234567890123456789012345678901234
                 
 PREHOOK: query: explain insert into t(i) values(3)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@t
 POSTHOOK: query: explain insert into t(i) values(3)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@t
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -2388,8 +2448,12 @@ POSTHOOK: Output: database:default
 POSTHOOK: Output: default@tablePartitioned_n0
 PREHOOK: query: explain INSERT INTO tablePartitioned_n0 partition(p1='today', 
p2=10) values('not', 'null', 'constraint')
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@tablepartitioned_n0@p1=today/p2=10
 POSTHOOK: query: explain INSERT INTO tablePartitioned_n0 partition(p1='today', 
p2=10) values('not', 'null', 'constraint')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@tablepartitioned_n0@p1=today/p2=10
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -2540,8 +2604,12 @@ Column Name:f            Default Value:1234567.89
                 
 PREHOOK: query: EXPLAIN INSERT INTO numericDataType_n1(b) values(456)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@numericdatatype_n1
 POSTHOOK: query: EXPLAIN INSERT INTO numericDataType_n1(b) values(456)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@numericdatatype_n1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -2704,8 +2772,12 @@ Column Name:f            Default Value:1234567.89
                 
 PREHOOK: query: EXPLAIN INSERT INTO numericDataType_n1(b) values(56)
 PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@numericdatatype_n1
 POSTHOOK: query: EXPLAIN INSERT INTO numericDataType_n1(b) values(56)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@numericdatatype_n1
 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/deleteAnalyze.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out 
b/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out
index bf82b32..517c179 100644
--- a/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out
+++ b/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out
@@ -151,6 +151,8 @@ coalesce(d.sales_tax,0) as tax
 from testdeci2_n0 s join testdeci2_n0 d
 on s.item=d.item and d.id=2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@testdeci2_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select s.id,
 coalesce(d.amount,0) as sales,
@@ -158,6 +160,8 @@ coalesce(d.sales_tax,0) as tax
 from testdeci2_n0 s join testdeci2_n0 d
 on s.item=d.item and d.id=2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@testdeci2_n0
+#### A masked pattern was here ####
 Plan optimized by CBO.
 
 Vertex dependency in root stage

http://git-wip-us.apache.org/repos/asf/hive/blob/c39b5d1b/ql/src/test/results/clientpositive/llap/disable_merge_for_bucketing.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/disable_merge_for_bucketing.q.out 
b/ql/src/test/results/clientpositive/llap/disable_merge_for_bucketing.q.out
index 5e004bf..864b8f9 100644
--- a/ql/src/test/results/clientpositive/llap/disable_merge_for_bucketing.q.out
+++ b/ql/src/test/results/clientpositive/llap/disable_merge_for_bucketing.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: explain extended
 insert overwrite table bucket2_1_n0
 select * from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@bucket2_1_n0
 POSTHOOK: query: explain extended
 insert overwrite table bucket2_1_n0
 select * from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@bucket2_1_n0
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -237,9 +241,13 @@ POSTHOOK: Lineage: bucket2_1_n0.value SIMPLE 
[(src)src.FieldSchema(name:value, t
 PREHOOK: query: explain
 select * from bucket2_1_n0 tablesample (bucket 1 out of 2) s order by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket2_1_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from bucket2_1_n0 tablesample (bucket 1 out of 2) s order by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket2_1_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

Reply via email to