http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/bucket3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucket3.q.out 
b/ql/src/test/results/clientpositive/llap/bucket3.q.out
index ebcedc9..1f45b19 100644
--- a/ql/src/test/results/clientpositive/llap/bucket3.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket3.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: explain extended
 insert overwrite table bucket3_1 partition (ds='1')
 select * from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@bucket3_1@ds=1
 POSTHOOK: query: explain extended
 insert overwrite table bucket3_1 partition (ds='1')
 select * from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@bucket3_1@ds=1
 OPTIMIZED SQL: SELECT `key`, `value`
 FROM `default`.`src`
 STAGE DEPENDENCIES:
@@ -269,9 +273,15 @@ POSTHOOK: Lineage: bucket3_1 PARTITION(ds=2).value SIMPLE 
[(src)src.FieldSchema(
 PREHOOK: query: explain
 select * from bucket3_1 tablesample (bucket 1 out of 2) s where ds = '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket3_1
+PREHOOK: Input: default@bucket3_1@ds=1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from bucket3_1 tablesample (bucket 1 out of 2) s where ds = '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket3_1
+POSTHOOK: Input: default@bucket3_1@ds=1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/bucket4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucket4.q.out 
b/ql/src/test/results/clientpositive/llap/bucket4.q.out
index be3f350..ec91b3e 100644
--- a/ql/src/test/results/clientpositive/llap/bucket4.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket4.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: explain extended
 insert overwrite table bucket4_1
 select * from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@bucket4_1
 POSTHOOK: query: explain extended
 insert overwrite table bucket4_1
 select * from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@bucket4_1
 OPTIMIZED SQL: SELECT `key`, `value`
 FROM `default`.`src`
 STAGE DEPENDENCIES:
@@ -242,9 +246,13 @@ POSTHOOK: Lineage: bucket4_1.value SIMPLE 
[(src)src.FieldSchema(name:value, type
 PREHOOK: query: explain
 select * from bucket4_1 tablesample (bucket 1 out of 2) s
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket4_1
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from bucket4_1 tablesample (bucket 1 out of 2) s
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket4_1
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/bucket5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucket5.q.out 
b/ql/src/test/results/clientpositive/llap/bucket5.q.out
index ee444f2..bd56c35 100644
--- a/ql/src/test/results/clientpositive/llap/bucket5.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket5.q.out
@@ -19,11 +19,17 @@ FROM src
 INSERT OVERWRITE TABLE bucketed_table SELECT key, value
 INSERT OVERWRITE TABLE unbucketed_table SELECT key, value cluster by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@bucketed_table
+PREHOOK: Output: default@unbucketed_table
 POSTHOOK: query: EXPLAIN EXTENDED
 FROM src
 INSERT OVERWRITE TABLE bucketed_table SELECT key, value
 INSERT OVERWRITE TABLE unbucketed_table SELECT key, value cluster by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@bucketed_table
+POSTHOOK: Output: default@unbucketed_table
 STAGE DEPENDENCIES:
   Stage-2 is a root stage
   Stage-3 depends on stages: Stage-2, Stage-7, Stage-6, Stage-9

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/bucket6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucket6.q.out 
b/ql/src/test/results/clientpositive/llap/bucket6.q.out
index d0c1500..f8d920b 100644
--- a/ql/src/test/results/clientpositive/llap/bucket6.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket6.q.out
@@ -9,9 +9,21 @@ POSTHOOK: Output: default@src_bucket
 PREHOOK: query: explain
 insert into table src_bucket select key,value from srcpart
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+PREHOOK: Output: default@src_bucket
 POSTHOOK: query: explain
 insert into table src_bucket select key,value from srcpart
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
+POSTHOOK: Output: default@src_bucket
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/bucket_groupby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucket_groupby.q.out 
b/ql/src/test/results/clientpositive/llap/bucket_groupby.q.out
index 1481996..7286d67 100644
--- a/ql/src/test/results/clientpositive/llap/bucket_groupby.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket_groupby.q.out
@@ -42,9 +42,15 @@ POSTHOOK: Lineage: clustergroupby PARTITION(ds=100).value 
SIMPLE [(src)src.Field
 PREHOOK: query: explain
 select key, count(1) from clustergroupby where ds='100' group by key order by 
key limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@clustergroupby
+PREHOOK: Input: default@clustergroupby@ds=100
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, count(1) from clustergroupby where ds='100' group by key order by 
key limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@clustergroupby
+POSTHOOK: Input: default@clustergroupby@ds=100
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -174,9 +180,15 @@ POSTHOOK: Lineage: clustergroupby PARTITION(ds=101).value 
SIMPLE [(src)src.Field
 PREHOOK: query: explain
 select key, count(1) from clustergroupby  where ds='101'  group by key order 
by key limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@clustergroupby
+PREHOOK: Input: default@clustergroupby@ds=101
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, count(1) from clustergroupby  where ds='101'  group by key order 
by key limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@clustergroupby
+POSTHOOK: Input: default@clustergroupby@ds=101
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -281,9 +293,15 @@ POSTHOOK: Input: default@clustergroupby@ds=101
 PREHOOK: query: explain
 select length(key), count(1) from clustergroupby  where ds='101'  group by 
length(key) limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@clustergroupby
+PREHOOK: Input: default@clustergroupby@ds=101
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select length(key), count(1) from clustergroupby  where ds='101'  group by 
length(key) limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@clustergroupby
+POSTHOOK: Input: default@clustergroupby@ds=101
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -367,9 +385,15 @@ POSTHOOK: Input: default@clustergroupby@ds=101
 PREHOOK: query: explain
 select abs(length(key)), count(1) from clustergroupby  where ds='101'  group 
by abs(length(key)) limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@clustergroupby
+PREHOOK: Input: default@clustergroupby@ds=101
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select abs(length(key)), count(1) from clustergroupby  where ds='101'  group 
by abs(length(key)) limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@clustergroupby
+POSTHOOK: Input: default@clustergroupby@ds=101
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -453,9 +477,15 @@ POSTHOOK: Input: default@clustergroupby@ds=101
 PREHOOK: query: explain
 select key, count(1) from clustergroupby  where ds='101'  group by key,'a' 
order by key,'a' limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@clustergroupby
+PREHOOK: Input: default@clustergroupby@ds=101
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, count(1) from clustergroupby  where ds='101'  group by key,'a' 
order by key,'a' limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@clustergroupby
+POSTHOOK: Input: default@clustergroupby@ds=101
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -560,9 +590,15 @@ POSTHOOK: Input: default@clustergroupby@ds=101
 PREHOOK: query: explain
 select key, count(1) from (select value as key, key as value from 
clustergroupby where ds='101')subq group by key order by key limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@clustergroupby
+PREHOOK: Input: default@clustergroupby@ds=101
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, count(1) from (select value as key, key as value from 
clustergroupby where ds='101')subq group by key order by key limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@clustergroupby
+POSTHOOK: Input: default@clustergroupby@ds=101
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -667,9 +703,17 @@ val_114    1
 PREHOOK: query: explain
 select key, count(1) from clustergroupby  group by key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@clustergroupby
+PREHOOK: Input: default@clustergroupby@ds=100
+PREHOOK: Input: default@clustergroupby@ds=101
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, count(1) from clustergroupby  group by key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@clustergroupby
+POSTHOOK: Input: default@clustergroupby@ds=100
+POSTHOOK: Input: default@clustergroupby@ds=101
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1052,9 +1096,17 @@ POSTHOOK: Input: default@clustergroupby@ds=101
 PREHOOK: query: explain
 select key, count(1) from clustergroupby  group by key, 3
 PREHOOK: type: QUERY
+PREHOOK: Input: default@clustergroupby
+PREHOOK: Input: default@clustergroupby@ds=100
+PREHOOK: Input: default@clustergroupby@ds=101
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, count(1) from clustergroupby  group by key, 3
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@clustergroupby
+POSTHOOK: Input: default@clustergroupby@ds=100
+POSTHOOK: Input: default@clustergroupby@ds=101
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1165,9 +1217,15 @@ POSTHOOK: Lineage: clustergroupby 
PARTITION(ds=102).value SIMPLE [(src)src.Field
 PREHOOK: query: explain
 select key, count(1) from clustergroupby  where ds='102'  group by key order 
by key limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@clustergroupby
+PREHOOK: Input: default@clustergroupby@ds=102
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, count(1) from clustergroupby  where ds='102'  group by key order 
by key limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@clustergroupby
+POSTHOOK: Input: default@clustergroupby@ds=102
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1273,9 +1331,15 @@ POSTHOOK: Input: default@clustergroupby@ds=102
 PREHOOK: query: explain
 select value, count(1) from clustergroupby  where ds='102'  group by value 
order by value limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@clustergroupby
+PREHOOK: Input: default@clustergroupby@ds=102
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select value, count(1) from clustergroupby  where ds='102'  group by value 
order by value limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@clustergroupby
+POSTHOOK: Input: default@clustergroupby@ds=102
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1380,9 +1444,15 @@ val_114  1
 PREHOOK: query: explain
 select key, count(1) from clustergroupby  where ds='102'  group by key, value 
limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@clustergroupby
+PREHOOK: Input: default@clustergroupby@ds=102
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, count(1) from clustergroupby  where ds='102'  group by key, value 
limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@clustergroupby
+POSTHOOK: Input: default@clustergroupby@ds=102
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -1480,9 +1550,15 @@ POSTHOOK: Lineage: clustergroupby 
PARTITION(ds=103).value SIMPLE [(src)src.Field
 PREHOOK: query: explain
 select key, count(1) from clustergroupby  where ds='103'  group by key order 
by key limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@clustergroupby
+PREHOOK: Input: default@clustergroupby@ds=103
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, count(1) from clustergroupby  where ds='103'  group by key order 
by key limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@clustergroupby
+POSTHOOK: Input: default@clustergroupby@ds=103
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1588,9 +1664,15 @@ POSTHOOK: Input: default@clustergroupby@ds=103
 PREHOOK: query: explain
 select key, count(1) from clustergroupby  where ds='103'  group by value, key 
order by key limit 10
 PREHOOK: type: QUERY
+PREHOOK: Input: default@clustergroupby
+PREHOOK: Input: default@clustergroupby@ds=103
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select key, count(1) from clustergroupby  where ds='103'  group by value, key 
order by key limit 10
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@clustergroupby
+POSTHOOK: Input: default@clustergroupby@ds=103
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/bucket_many.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucket_many.q.out 
b/ql/src/test/results/clientpositive/llap/bucket_many.q.out
index 80b7b4e..cf16d47 100644
--- a/ql/src/test/results/clientpositive/llap/bucket_many.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket_many.q.out
@@ -10,10 +10,14 @@ PREHOOK: query: explain extended
 insert overwrite table bucket_many
 select * from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@bucket_many
 POSTHOOK: query: explain extended
 insert overwrite table bucket_many
 select * from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@bucket_many
 OPTIMIZED SQL: SELECT `key`, `value`
 FROM `default`.`src`
 STAGE DEPENDENCIES:
@@ -252,9 +256,13 @@ POSTHOOK: Lineage: bucket_many.value SIMPLE 
[(src)src.FieldSchema(name:value, ty
 PREHOOK: query: explain
 select * from bucket_many tablesample (bucket 2 out of 256) s
 PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_many
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select * from bucket_many tablesample (bucket 2 out of 256) s
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_many
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out 
b/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out
index ef84475..9989188 100644
--- a/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket_map_join_tez2.q.out
@@ -166,8 +166,14 @@ POSTHOOK: Output: default@tab_part_n11@ds=2008-04-08
 #### A masked pattern was here ####
 PREHOOK: query: explain select a.key, b.key from tab_part_n11 a join 
tab_part_n11 c on a.key = c.key join tab_part_n11 b on a.value = b.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab_part_n11
+PREHOOK: Input: default@tab_part_n11@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain select a.key, b.key from tab_part_n11 a join 
tab_part_n11 c on a.key = c.key join tab_part_n11 b on a.value = b.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab_part_n11
+POSTHOOK: Input: default@tab_part_n11@ds=2008-04-08
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -288,8 +294,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select a.key, b.key from tab_part_n11 a join 
tab_part_n11 c on a.key = c.key join tab_part_n11 b on a.value = b.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab_part_n11
+PREHOOK: Input: default@tab_part_n11@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain select a.key, b.key from tab_part_n11 a join 
tab_part_n11 c on a.key = c.key join tab_part_n11 b on a.value = b.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab_part_n11
+POSTHOOK: Input: default@tab_part_n11@ds=2008-04-08
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -444,10 +456,16 @@ PREHOOK: query: explain
 select a.key, a.value, b.value
 from tab1_n5 a join src b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@tab1_n5
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select a.key, a.value, b.value
 from tab1_n5 a join src b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@tab1_n5
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -533,10 +551,16 @@ PREHOOK: query: explain
 select a.key, a.value, b.value
 from tab1_n5 a join src b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@tab1_n5
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select a.key, a.value, b.value
 from tab1_n5 a join src b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@tab1_n5
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -621,9 +645,15 @@ STAGE PLANS:
 PREHOOK: query: explain
 select a.key, b.key from (select key from tab_part_n11 where key > 1) a join 
(select key from tab_part_n11 where key > 2) b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab_part_n11
+PREHOOK: Input: default@tab_part_n11@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select a.key, b.key from (select key from tab_part_n11 where key > 1) a join 
(select key from tab_part_n11 where key > 2) b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab_part_n11
+POSTHOOK: Input: default@tab_part_n11@ds=2008-04-08
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -702,9 +732,15 @@ STAGE PLANS:
 PREHOOK: query: explain
 select a.key, b.key from (select key from tab_part_n11 where key > 1) a join 
(select key from tab_part_n11 where key > 2) b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab_part_n11
+PREHOOK: Input: default@tab_part_n11@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select a.key, b.key from (select key from tab_part_n11 where key > 1) a join 
(select key from tab_part_n11 where key > 2) b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab_part_n11
+POSTHOOK: Input: default@tab_part_n11@ds=2008-04-08
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -777,9 +813,15 @@ STAGE PLANS:
 PREHOOK: query: explain
 select a.key, b.key from (select key from tab_part_n11 where key > 1) a left 
outer join (select key from tab_part_n11 where key > 2) b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab_part_n11
+PREHOOK: Input: default@tab_part_n11@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select a.key, b.key from (select key from tab_part_n11 where key > 1) a left 
outer join (select key from tab_part_n11 where key > 2) b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab_part_n11
+POSTHOOK: Input: default@tab_part_n11@ds=2008-04-08
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -858,9 +900,15 @@ STAGE PLANS:
 PREHOOK: query: explain
 select a.key, b.key from (select key from tab_part_n11 where key > 1) a left 
outer join (select key from tab_part_n11 where key > 2) b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab_part_n11
+PREHOOK: Input: default@tab_part_n11@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select a.key, b.key from (select key from tab_part_n11 where key > 1) a left 
outer join (select key from tab_part_n11 where key > 2) b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab_part_n11
+POSTHOOK: Input: default@tab_part_n11@ds=2008-04-08
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -933,9 +981,15 @@ STAGE PLANS:
 PREHOOK: query: explain
 select a.key, b.key from (select key from tab_part_n11 where key > 1) a right 
outer join (select key from tab_part_n11 where key > 2) b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab_part_n11
+PREHOOK: Input: default@tab_part_n11@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select a.key, b.key from (select key from tab_part_n11 where key > 1) a right 
outer join (select key from tab_part_n11 where key > 2) b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab_part_n11
+POSTHOOK: Input: default@tab_part_n11@ds=2008-04-08
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1014,9 +1068,15 @@ STAGE PLANS:
 PREHOOK: query: explain
 select a.key, b.key from (select key from tab_part_n11 where key > 1) a right 
outer join (select key from tab_part_n11 where key > 2) b on a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab_part_n11
+PREHOOK: Input: default@tab_part_n11@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select a.key, b.key from (select key from tab_part_n11 where key > 1) a right 
outer join (select key from tab_part_n11 where key > 2) b on a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab_part_n11
+POSTHOOK: Input: default@tab_part_n11@ds=2008-04-08
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1088,8 +1148,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select a.key, b.key from (select distinct key from 
tab_n10) a join tab_n10 b on b.key = a.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab_n10
+PREHOOK: Input: default@tab_n10@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain select a.key, b.key from (select distinct key from 
tab_n10) a join tab_n10 b on b.key = a.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab_n10
+POSTHOOK: Input: default@tab_n10@ds=2008-04-08
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1172,8 +1238,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select a.key, b.key from (select distinct key from 
tab_n10) a join tab_n10 b on b.key = a.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab_n10
+PREHOOK: Input: default@tab_n10@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain select a.key, b.key from (select distinct key from 
tab_n10) a join tab_n10 b on b.key = a.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab_n10
+POSTHOOK: Input: default@tab_n10@ds=2008-04-08
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1260,8 +1332,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select a.value, b.value from (select distinct value 
from tab_n10) a join tab_n10 b on b.key = a.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab_n10
+PREHOOK: Input: default@tab_n10@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain select a.value, b.value from (select distinct value 
from tab_n10) a join tab_n10 b on b.key = a.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab_n10
+POSTHOOK: Input: default@tab_n10@ds=2008-04-08
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1360,8 +1438,14 @@ STAGE PLANS:
 
 PREHOOK: query: explain select a.value, b.value from (select distinct value 
from tab_n10) a join tab_n10 b on b.key = a.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab_n10
+PREHOOK: Input: default@tab_n10@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain select a.value, b.value from (select distinct value 
from tab_n10) a join tab_n10 b on b.key = a.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab_n10
+POSTHOOK: Input: default@tab_n10@ds=2008-04-08
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1499,11 +1583,21 @@ select count(*)
 from
 (select distinct key,value from tab_part_n11) a join tab_n10 b on a.key = 
b.key and a.value = b.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab_n10
+PREHOOK: Input: default@tab_n10@ds=2008-04-08
+PREHOOK: Input: default@tab_part_n11
+PREHOOK: Input: default@tab_part_n11@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*)
 from
 (select distinct key,value from tab_part_n11) a join tab_n10 b on a.key = 
b.key and a.value = b.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab_n10
+POSTHOOK: Input: default@tab_n10@ds=2008-04-08
+POSTHOOK: Input: default@tab_part_n11
+POSTHOOK: Input: default@tab_part_n11@ds=2008-04-08
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1616,11 +1710,21 @@ select count(*)
 from
 (select distinct key,value from tab_part_n11) a join tab_n10 b on a.key = 
b.key and a.value = b.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab_n10
+PREHOOK: Input: default@tab_n10@ds=2008-04-08
+PREHOOK: Input: default@tab_part_n11
+PREHOOK: Input: default@tab_part_n11@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain
 select count(*)
 from
 (select distinct key,value from tab_part_n11) a join tab_n10 b on a.key = 
b.key and a.value = b.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab_n10
+POSTHOOK: Input: default@tab_n10@ds=2008-04-08
+POSTHOOK: Input: default@tab_part_n11
+POSTHOOK: Input: default@tab_part_n11@ds=2008-04-08
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1766,8 +1870,18 @@ POSTHOOK: Output: default@big@k=2
 POSTHOOK: Lineage: big PARTITION(k=2).i SCRIPT []
 PREHOOK: query: explain select small.i, big.i from small,big where 
small.i=big.i
 PREHOOK: type: QUERY
+PREHOOK: Input: default@big
+PREHOOK: Input: default@big@k=1
+PREHOOK: Input: default@big@k=2
+PREHOOK: Input: default@small
+#### A masked pattern was here ####
 POSTHOOK: query: explain select small.i, big.i from small,big where 
small.i=big.i
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@big
+POSTHOOK: Input: default@big@k=1
+POSTHOOK: Input: default@big@k=2
+POSTHOOK: Input: default@small
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1896,8 +2010,14 @@ POSTHOOK: Output: default@tab_part_ext@ds=2008-04-08
 test.comment=Bucket map join should work here
 PREHOOK: query: explain select a.key, b.key from tab_part_n11 a join 
tab_part_n11 c on a.key = c.key join tab_part_n11 b on a.value = b.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab_part_n11
+PREHOOK: Input: default@tab_part_n11@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain select a.key, b.key from tab_part_n11 a join 
tab_part_n11 c on a.key = c.key join tab_part_n11 b on a.value = b.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab_part_n11
+POSTHOOK: Input: default@tab_part_n11@ds=2008-04-08
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2019,8 +2139,14 @@ STAGE PLANS:
 test.comment=External tables, bucket map join should be disabled
 PREHOOK: query: explain select a.key, b.key from tab_part_ext a join 
tab_part_ext c on a.key = c.key join tab_part_ext b on a.value = b.value
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab_part_ext
+PREHOOK: Input: default@tab_part_ext@ds=2008-04-08
+#### A masked pattern was here ####
 POSTHOOK: query: explain select a.key, b.key from tab_part_ext a join 
tab_part_ext c on a.key = c.key join tab_part_ext b on a.value = b.value
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab_part_ext
+POSTHOOK: Input: default@tab_part_ext@ds=2008-04-08
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -2191,6 +2317,9 @@ WHERE my_fact.fiscal_year = '2015'
 AND my_dim.filter_col IN ( 'VAL1', 'VAL2' )
 and my_fact.accounting_period in (10)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@my_dim
+PREHOOK: Input: default@my_fact
+#### A masked pattern was here ####
 POSTHOOK: query: explain  extended
 select bucket_col, my_dim.join_col as account1,my_fact.accounting_period
 FROM my_fact JOIN my_dim ON my_fact.join_col = my_dim.join_col
@@ -2198,6 +2327,9 @@ WHERE my_fact.fiscal_year = '2015'
 AND my_dim.filter_col IN ( 'VAL1', 'VAL2' )
 and my_fact.accounting_period in (10)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@my_dim
+POSTHOOK: Input: default@my_fact
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/bucket_map_join_tez_empty.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/bucket_map_join_tez_empty.q.out 
b/ql/src/test/results/clientpositive/llap/bucket_map_join_tez_empty.q.out
index 20d20ec..ef64838 100644
--- a/ql/src/test/results/clientpositive/llap/bucket_map_join_tez_empty.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket_map_join_tez_empty.q.out
@@ -36,8 +36,14 @@ POSTHOOK: Lineage: tab2_n0.key1 SCRIPT []
 POSTHOOK: Lineage: tab2_n0.value SCRIPT []
 PREHOOK: query: explain select * from tab1_n0, tab2_n0 where tab1_n0.key1 = 
tab2_n0.key1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@tab1_n0
+PREHOOK: Input: default@tab2_n0
+#### A masked pattern was here ####
 POSTHOOK: query: explain select * from tab1_n0, tab2_n0 where tab1_n0.key1 = 
tab2_n0.key1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tab1_n0
+POSTHOOK: Input: default@tab2_n0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/bucket_num_reducers.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucket_num_reducers.q.out 
b/ql/src/test/results/clientpositive/llap/bucket_num_reducers.q.out
index ce23bdf..5991253 100644
--- a/ql/src/test/results/clientpositive/llap/bucket_num_reducers.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket_num_reducers.q.out
@@ -9,9 +9,13 @@ POSTHOOK: Output: default@bucket_nr
 PREHOOK: query: explain extended insert overwrite table bucket_nr
   select * from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@bucket_nr
 POSTHOOK: query: explain extended insert overwrite table bucket_nr
   select * from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@bucket_nr
 OPTIMIZED SQL: SELECT `key`, `value`
 FROM `default`.`src`
 STAGE DEPENDENCIES:

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/bucket_num_reducers2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucket_num_reducers2.q.out 
b/ql/src/test/results/clientpositive/llap/bucket_num_reducers2.q.out
index ee9cb78..87b1294 100644
--- a/ql/src/test/results/clientpositive/llap/bucket_num_reducers2.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket_num_reducers2.q.out
@@ -9,9 +9,13 @@ POSTHOOK: Output: default@test_table_n4
 PREHOOK: query: explain extended insert overwrite table test_table_n4
   select * from src
 PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@test_table_n4
 POSTHOOK: query: explain extended insert overwrite table test_table_n4
   select * from src
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@test_table_n4
 OPTIMIZED SQL: SELECT `key`, `value`
 FROM `default`.`src`
 STAGE DEPENDENCIES:

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out 
b/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out
index a52177e..22842b5 100644
--- a/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out
@@ -27,11 +27,17 @@ select /*+mapjoin(b)*/ a.key, a.value, b.value
 from srcbucket_mapjoin_part_n1 a join srcbucket_mapjoin_part_2_n1 b
 on a.key=b.key where b.ds="2008-04-08"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n1
+PREHOOK: Input: default@srcbucket_mapjoin_part_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select /*+mapjoin(b)*/ a.key, a.value, b.value
 from srcbucket_mapjoin_part_n1 a join srcbucket_mapjoin_part_2_n1 b
 on a.key=b.key where b.ds="2008-04-08"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n1
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n1
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value`, `t2`.`value` AS `value1`
 FROM (SELECT `key`, `value`
 FROM `default`.`srcbucket_mapjoin_part_n1`
@@ -166,11 +172,17 @@ select /*+mapjoin(a)*/ a.key, a.value, b.value
 from srcbucket_mapjoin_part_n1 a join srcbucket_mapjoin_part_2_n1 b
 on a.key=b.key where b.ds="2008-04-08"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n1
+PREHOOK: Input: default@srcbucket_mapjoin_part_n1
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select /*+mapjoin(a)*/ a.key, a.value, b.value
 from srcbucket_mapjoin_part_n1 a join srcbucket_mapjoin_part_2_n1 b
 on a.key=b.key where b.ds="2008-04-08"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n1
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n1
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value`, `t2`.`value` AS `value1`
 FROM (SELECT `key`, `value`
 FROM `default`.`srcbucket_mapjoin_part_n1`
@@ -396,12 +408,20 @@ select /*+mapjoin(b)*/ a.key, a.value, b.value
 from srcbucket_mapjoin_n1 a join srcbucket_mapjoin_part_n1 b 
 on a.key=b.key where b.ds="2008-04-08"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_n1
+PREHOOK: Input: default@srcbucket_mapjoin_part_n1
+PREHOOK: Input: default@srcbucket_mapjoin_part_n1@ds=2008-04-08
+PREHOOK: Output: default@bucketmapjoin_tmp_result_n0
 POSTHOOK: query: explain extended
 insert overwrite table bucketmapjoin_tmp_result_n0 
 select /*+mapjoin(b)*/ a.key, a.value, b.value 
 from srcbucket_mapjoin_n1 a join srcbucket_mapjoin_part_n1 b 
 on a.key=b.key where b.ds="2008-04-08"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_n1
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n1
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n1@ds=2008-04-08
+POSTHOOK: Output: default@bucketmapjoin_tmp_result_n0
 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value`, `t2`.`value` AS `value1`
 FROM (SELECT `key`, `value`
 FROM `default`.`srcbucket_mapjoin_n1`
@@ -828,12 +848,20 @@ select /*+mapjoin(a)*/ a.key, a.value, b.value
 from srcbucket_mapjoin_n1 a join srcbucket_mapjoin_part_n1 b 
 on a.key=b.key where b.ds="2008-04-08"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_n1
+PREHOOK: Input: default@srcbucket_mapjoin_part_n1
+PREHOOK: Input: default@srcbucket_mapjoin_part_n1@ds=2008-04-08
+PREHOOK: Output: default@bucketmapjoin_tmp_result_n0
 POSTHOOK: query: explain extended
 insert overwrite table bucketmapjoin_tmp_result_n0 
 select /*+mapjoin(a)*/ a.key, a.value, b.value 
 from srcbucket_mapjoin_n1 a join srcbucket_mapjoin_part_n1 b 
 on a.key=b.key where b.ds="2008-04-08"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_n1
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n1
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n1@ds=2008-04-08
+POSTHOOK: Output: default@bucketmapjoin_tmp_result_n0
 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value`, `t2`.`value` AS `value1`
 FROM (SELECT `key`, `value`
 FROM `default`.`srcbucket_mapjoin_n1`

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out 
b/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out
index 3ffbd4c..f775db5 100644
--- a/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out
@@ -94,12 +94,22 @@ select /*+mapjoin(b)*/ a.key, a.value, b.value
 from srcbucket_mapjoin_part_n6 a join srcbucket_mapjoin_part_2_n5 b
 on a.key=b.key and b.ds="2008-04-08"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n5
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n5@ds=2008-04-08
+PREHOOK: Input: default@srcbucket_mapjoin_part_n6
+PREHOOK: Input: default@srcbucket_mapjoin_part_n6@ds=2008-04-08
+PREHOOK: Output: default@bucketmapjoin_tmp_result_n2
 POSTHOOK: query: explain extended
 insert overwrite table bucketmapjoin_tmp_result_n2 
 select /*+mapjoin(b)*/ a.key, a.value, b.value 
 from srcbucket_mapjoin_part_n6 a join srcbucket_mapjoin_part_2_n5 b
 on a.key=b.key and b.ds="2008-04-08"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n5
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n5@ds=2008-04-08
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n6
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n6@ds=2008-04-08
+POSTHOOK: Output: default@bucketmapjoin_tmp_result_n2
 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value`, `t2`.`value` AS `value1`
 FROM (SELECT `key`, `value`
 FROM `default`.`srcbucket_mapjoin_part_n6`
@@ -531,12 +541,22 @@ select /*+mapjoin(a)*/ a.key, a.value, b.value
 from srcbucket_mapjoin_part_n6 a join srcbucket_mapjoin_part_2_n5 b
 on a.key=b.key and b.ds="2008-04-08"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n5
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n5@ds=2008-04-08
+PREHOOK: Input: default@srcbucket_mapjoin_part_n6
+PREHOOK: Input: default@srcbucket_mapjoin_part_n6@ds=2008-04-08
+PREHOOK: Output: default@bucketmapjoin_tmp_result_n2
 POSTHOOK: query: explain extended
 insert overwrite table bucketmapjoin_tmp_result_n2 
 select /*+mapjoin(a)*/ a.key, a.value, b.value 
 from srcbucket_mapjoin_part_n6 a join srcbucket_mapjoin_part_2_n5 b
 on a.key=b.key and b.ds="2008-04-08"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n5
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n5@ds=2008-04-08
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n6
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n6@ds=2008-04-08
+POSTHOOK: Output: default@bucketmapjoin_tmp_result_n2
 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value`, `t2`.`value` AS `value1`
 FROM (SELECT `key`, `value`
 FROM `default`.`srcbucket_mapjoin_part_n6`
@@ -985,12 +1005,24 @@ select /*+mapjoin(b)*/ a.key, a.value, b.value
 from srcbucket_mapjoin_part_n6 a join srcbucket_mapjoin_part_2_n5 b
 on a.key=b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n5
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n5@ds=2008-04-08
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n5@ds=2008-04-09
+PREHOOK: Input: default@srcbucket_mapjoin_part_n6
+PREHOOK: Input: default@srcbucket_mapjoin_part_n6@ds=2008-04-08
+PREHOOK: Output: default@bucketmapjoin_tmp_result_n2
 POSTHOOK: query: explain extended
 insert overwrite table bucketmapjoin_tmp_result_n2
 select /*+mapjoin(b)*/ a.key, a.value, b.value
 from srcbucket_mapjoin_part_n6 a join srcbucket_mapjoin_part_2_n5 b
 on a.key=b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n5
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n5@ds=2008-04-08
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n5@ds=2008-04-09
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n6
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n6@ds=2008-04-08
+POSTHOOK: Output: default@bucketmapjoin_tmp_result_n2
 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value`, `t2`.`value` AS `value1`
 FROM (SELECT `key`, `value`
 FROM `default`.`srcbucket_mapjoin_part_n6`

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out 
b/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out
index eb059d4..8cee3ee 100644
--- a/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out
@@ -118,12 +118,22 @@ select /*+mapjoin(b)*/ a.key, a.value, b.value
 from srcbucket_mapjoin_part_2_n11 a join srcbucket_mapjoin_part_n13 b 
 on a.key=b.key and b.ds="2008-04-08" and a.ds="2008-04-08"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n11
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n11@ds=2008-04-08
+PREHOOK: Input: default@srcbucket_mapjoin_part_n13
+PREHOOK: Input: default@srcbucket_mapjoin_part_n13@ds=2008-04-08
+PREHOOK: Output: default@bucketmapjoin_tmp_result_n6
 POSTHOOK: query: explain extended
 insert overwrite table bucketmapjoin_tmp_result_n6 
 select /*+mapjoin(b)*/ a.key, a.value, b.value 
 from srcbucket_mapjoin_part_2_n11 a join srcbucket_mapjoin_part_n13 b 
 on a.key=b.key and b.ds="2008-04-08" and a.ds="2008-04-08"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n11
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n11@ds=2008-04-08
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n13
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n13@ds=2008-04-08
+POSTHOOK: Output: default@bucketmapjoin_tmp_result_n6
 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value`, `t2`.`value` AS `value1`
 FROM (SELECT `key`, `value`, CAST('2008-04-08' AS STRING) AS `ds`
 FROM `default`.`srcbucket_mapjoin_part_2_n11`
@@ -555,12 +565,22 @@ select /*+mapjoin(a)*/ a.key, a.value, b.value
 from srcbucket_mapjoin_part_2_n11 a join srcbucket_mapjoin_part_n13 b 
 on a.key=b.key and b.ds="2008-04-08" and a.ds="2008-04-08"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n11
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n11@ds=2008-04-08
+PREHOOK: Input: default@srcbucket_mapjoin_part_n13
+PREHOOK: Input: default@srcbucket_mapjoin_part_n13@ds=2008-04-08
+PREHOOK: Output: default@bucketmapjoin_tmp_result_n6
 POSTHOOK: query: explain extended 
 insert overwrite table bucketmapjoin_tmp_result_n6 
 select /*+mapjoin(a)*/ a.key, a.value, b.value 
 from srcbucket_mapjoin_part_2_n11 a join srcbucket_mapjoin_part_n13 b 
 on a.key=b.key and b.ds="2008-04-08" and a.ds="2008-04-08"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n11
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n11@ds=2008-04-08
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n13
+POSTHOOK: Input: default@srcbucket_mapjoin_part_n13@ds=2008-04-08
+POSTHOOK: Output: default@bucketmapjoin_tmp_result_n6
 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value`, `t2`.`value` AS `value1`
 FROM (SELECT `key`, `value`, CAST('2008-04-08' AS STRING) AS `ds`
 FROM `default`.`srcbucket_mapjoin_part_2_n11`

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/bucketmapjoin4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucketmapjoin4.q.out 
b/ql/src/test/results/clientpositive/llap/bucketmapjoin4.q.out
index 47c08c4..e6aabc7 100644
--- a/ql/src/test/results/clientpositive/llap/bucketmapjoin4.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin4.q.out
@@ -118,12 +118,16 @@ select /*+mapjoin(b)*/ a.key, a.value, b.value
 from srcbucket_mapjoin_n17 a join srcbucket_mapjoin_n17 b
 on a.key=b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_n17
+PREHOOK: Output: default@bucketmapjoin_tmp_result_n8
 POSTHOOK: query: explain extended
 insert overwrite table bucketmapjoin_tmp_result_n8
 select /*+mapjoin(b)*/ a.key, a.value, b.value
 from srcbucket_mapjoin_n17 a join srcbucket_mapjoin_n17 b
 on a.key=b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_n17
+POSTHOOK: Output: default@bucketmapjoin_tmp_result_n8
 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value`, `t2`.`value` AS `value1`
 FROM (SELECT `key`, `value`
 FROM `default`.`srcbucket_mapjoin_n17`
@@ -541,12 +545,16 @@ select /*+mapjoin(a)*/ a.key, a.value, b.value
 from srcbucket_mapjoin_n17 a join srcbucket_mapjoin_n17 b
 on a.key=b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_n17
+PREHOOK: Output: default@bucketmapjoin_tmp_result_n8
 POSTHOOK: query: explain extended
 insert overwrite table bucketmapjoin_tmp_result_n8
 select /*+mapjoin(a)*/ a.key, a.value, b.value
 from srcbucket_mapjoin_n17 a join srcbucket_mapjoin_n17 b
 on a.key=b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_n17
+POSTHOOK: Output: default@bucketmapjoin_tmp_result_n8
 OPTIMIZED SQL: SELECT `t0`.`key`, `t0`.`value`, `t2`.`value` AS `value1`
 FROM (SELECT `key`, `value`
 FROM `default`.`srcbucket_mapjoin_n17`

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/bucketmapjoin7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucketmapjoin7.q.out 
b/ql/src/test/results/clientpositive/llap/bucketmapjoin7.q.out
index a9e5ca1..76a65fd 100644
--- a/ql/src/test/results/clientpositive/llap/bucketmapjoin7.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin7.q.out
@@ -58,12 +58,22 @@ FROM srcbucket_mapjoin_part_1_n4 a JOIN 
srcbucket_mapjoin_part_2_n9 b
 ON a.key = b.key AND a.ds = '2008-04-08' AND b.ds = '2008-04-08'
 ORDER BY a.key, b.value LIMIT 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n4
+PREHOOK: Input: default@srcbucket_mapjoin_part_1_n4@ds=2008-04-08/hr=0
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n9
+PREHOOK: Input: default@srcbucket_mapjoin_part_2_n9@ds=2008-04-08/hr=0
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN EXTENDED
 SELECT /*+ MAPJOIN(b) */ a.key, b.value
 FROM srcbucket_mapjoin_part_1_n4 a JOIN srcbucket_mapjoin_part_2_n9 b
 ON a.key = b.key AND a.ds = '2008-04-08' AND b.ds = '2008-04-08'
 ORDER BY a.key, b.value LIMIT 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n4
+POSTHOOK: Input: default@srcbucket_mapjoin_part_1_n4@ds=2008-04-08/hr=0
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n9
+POSTHOOK: Input: default@srcbucket_mapjoin_part_2_n9@ds=2008-04-08/hr=0
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/bucketpruning1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucketpruning1.q.out 
b/ql/src/test/results/clientpositive/llap/bucketpruning1.q.out
index cc637db..db71c73 100644
--- a/ql/src/test/results/clientpositive/llap/bucketpruning1.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketpruning1.q.out
@@ -17,9 +17,13 @@ POSTHOOK: Output: default@srcbucket_unpruned
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where key = 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where key = 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST(1 AS INTEGER) AS `key`, `value`, `ds`
 FROM `default`.`srcbucket_pruned`
 WHERE `key` = 1
@@ -82,9 +86,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where key = 16
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where key = 16
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST(16 AS INTEGER) AS `key`, `value`, `ds`
 FROM `default`.`srcbucket_pruned`
 WHERE `key` = 16
@@ -147,9 +155,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where key = 17
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where key = 17
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST(17 AS INTEGER) AS `key`, `value`, `ds`
 FROM `default`.`srcbucket_pruned`
 WHERE `key` = 17
@@ -212,9 +224,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where key = 16+1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where key = 16+1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST(17 AS INTEGER) AS `key`, `value`, `ds`
 FROM `default`.`srcbucket_pruned`
 WHERE `key` = 17
@@ -277,9 +293,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where key = '11'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where key = '11'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST(11 AS INTEGER) AS `key`, `value`, `ds`
 FROM `default`.`srcbucket_pruned`
 WHERE `key` = 11
@@ -342,9 +362,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where key = 1 and ds='2008-04-08'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where key = 1 and ds='2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST(1 AS INTEGER) AS `key`, `value`, CAST('2008-04-08' 
AS STRING) AS `ds`
 FROM `default`.`srcbucket_pruned`
 WHERE `key` = 1 AND `ds` = '2008-04-08'
@@ -407,9 +431,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where key = 1 and ds='2008-04-08' and 
value='One'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where key = 1 and ds='2008-04-08' and 
value='One'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST(1 AS INTEGER) AS `key`, CAST('One' AS STRING) AS 
`value`, CAST('2008-04-08' AS STRING) AS `ds`
 FROM `default`.`srcbucket_pruned`
 WHERE `key` = 1 AND `ds` = '2008-04-08' AND `value` = 'One'
@@ -472,9 +500,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where value='One' and key = 1 and 
ds='2008-04-08'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where value='One' and key = 1 and 
ds='2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST(1 AS INTEGER) AS `key`, CAST('One' AS STRING) AS 
`value`, CAST('2008-04-08' AS STRING) AS `ds`
 FROM `default`.`srcbucket_pruned`
 WHERE `value` = 'One' AND `key` = 1 AND `ds` = '2008-04-08'
@@ -537,9 +569,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where key in (2,3)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where key in (2,3)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -599,9 +635,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where key in (2,3) and ds='2008-04-08'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where key in (2,3) and ds='2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -661,9 +701,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where key in (2,3) and ds='2008-04-08' and 
value='One'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where key in (2,3) and ds='2008-04-08' and 
value='One'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -723,9 +767,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where value='One' and key in (2,3) and 
ds='2008-04-08'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where value='One' and key in (2,3) and 
ds='2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -785,9 +833,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where (key=1 or key=2) and ds='2008-04-08'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where (key=1 or key=2) and ds='2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `key`, `value`, CAST('2008-04-08' AS STRING) AS `ds`
 FROM `default`.`srcbucket_pruned`
 WHERE (`key` = 1 OR `key` = 2) AND `ds` = '2008-04-08'
@@ -849,9 +901,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where (key=1 or key=2) and value = 'One' and 
ds='2008-04-08'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where (key=1 or key=2) and value = 'One' and 
ds='2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `key`, CAST('One' AS STRING) AS `value`, 
CAST('2008-04-08' AS STRING) AS `ds`
 FROM `default`.`srcbucket_pruned`
 WHERE (`key` = 1 OR `key` = 2) AND `value` = 'One' AND `ds` = '2008-04-08'
@@ -913,9 +969,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where key = -15
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where key = -15
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST(-15 AS INTEGER) AS `key`, `value`, `ds`
 FROM `default`.`srcbucket_pruned`
 WHERE `key` = -15
@@ -978,9 +1038,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where key in 
(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where key in 
(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1040,9 +1104,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where key in 
(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17) and ds='2008-04-08'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where key in 
(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17) and ds='2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1102,9 +1170,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where key in 
(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17) and ds='2008-04-08' and value='One'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where key in 
(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17) and ds='2008-04-08' and value='One'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1164,9 +1236,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where value='One' and key in 
(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17) and ds='2008-04-08'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where value='One' and key in 
(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17) and ds='2008-04-08'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1226,9 +1302,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where key = 1 and ds='2008-04-08' or key = 2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where key = 1 and ds='2008-04-08' or key = 2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `key`, `value`, `ds`
 FROM `default`.`srcbucket_pruned`
 WHERE `key` = 1 AND `ds` = '2008-04-08' OR `key` = 2
@@ -1290,9 +1370,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where key = 1 and ds='2008-04-08' and 
(value='One' or value = 'Two')
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where key = 1 and ds='2008-04-08' and 
(value='One' or value = 'Two')
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST(1 AS INTEGER) AS `key`, `value`, CAST('2008-04-08' 
AS STRING) AS `ds`
 FROM `default`.`srcbucket_pruned`
 WHERE `key` = 1 AND `ds` = '2008-04-08' AND (`value` = 'One' OR `value` = 
'Two')
@@ -1354,9 +1438,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where key = 1 or value = "One" or key = 2 and 
value = "Two"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where key = 1 or value = "One" or key = 2 and 
value = "Two"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `key`, `value`, `ds`
 FROM `default`.`srcbucket_pruned`
 WHERE `key` = 1 OR `value` = 'One' OR `key` = 2 AND `value` = 'Two'
@@ -1418,9 +1506,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where key = 'x11'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where key = 'x11'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `key`, `value`, `ds`
 FROM `default`.`srcbucket_pruned`
 WHERE FALSE
@@ -1481,9 +1573,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where key = 1 or value = "One"
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where key = 1 or value = "One"
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `key`, `value`, `ds`
 FROM `default`.`srcbucket_pruned`
 WHERE `key` = 1 OR `value` = 'One'
@@ -1545,9 +1641,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_pruned where key = 1 or value = "One" or key = 2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_pruned where key = 1 or value = "One" or key = 2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_pruned
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT `key`, `value`, `ds`
 FROM `default`.`srcbucket_pruned`
 WHERE `key` = 1 OR `value` = 'One' OR `key` = 2
@@ -1609,9 +1709,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_unpruned where key in (3, 5)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_unpruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_unpruned where key in (3, 5)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_unpruned
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
@@ -1670,9 +1774,13 @@ STAGE PLANS:
 PREHOOK: query: explain extended
 select * from srcbucket_unpruned where key = 1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket_unpruned
+#### A masked pattern was here ####
 POSTHOOK: query: explain extended
 select * from srcbucket_unpruned where key = 1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket_unpruned
+#### A masked pattern was here ####
 OPTIMIZED SQL: SELECT CAST(1 AS INTEGER) AS `key`, `value`, `ds`
 FROM `default`.`srcbucket_unpruned`
 WHERE `key` = 1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_2.q.out 
b/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_2.q.out
index 1bb1791..34d0844 100644
--- a/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_2.q.out
@@ -82,12 +82,22 @@ SELECT a.key, concat(a.value, b.value)
 FROM test_table1_n0 a JOIN test_table2_n0 b 
 ON a.key = b.key WHERE a.ds = '1' and b.ds = '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n0
+PREHOOK: Input: default@test_table1_n0@ds=1
+PREHOOK: Input: default@test_table2_n0
+PREHOOK: Input: default@test_table2_n0@ds=1
+PREHOOK: Output: default@test_table3_n0@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3_n0 PARTITION (ds = '1')
 SELECT a.key, concat(a.value, b.value) 
 FROM test_table1_n0 a JOIN test_table2_n0 b 
 ON a.key = b.key WHERE a.ds = '1' and b.ds = '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n0
+POSTHOOK: Input: default@test_table1_n0@ds=1
+POSTHOOK: Input: default@test_table2_n0
+POSTHOOK: Input: default@test_table2_n0@ds=1
+POSTHOOK: Output: default@test_table3_n0@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -290,12 +300,24 @@ SELECT a.key, concat(a.value, b.value)
 FROM test_table1_n0 a JOIN test_table2_n0 b 
 ON a.key = b.key WHERE a.ds is not null and b.ds = '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n0
+PREHOOK: Input: default@test_table1_n0@ds=1
+PREHOOK: Input: default@test_table1_n0@ds=2
+PREHOOK: Input: default@test_table2_n0
+PREHOOK: Input: default@test_table2_n0@ds=1
+PREHOOK: Output: default@test_table3_n0@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3_n0 PARTITION (ds = '1')
 SELECT a.key, concat(a.value, b.value) 
 FROM test_table1_n0 a JOIN test_table2_n0 b 
 ON a.key = b.key WHERE a.ds is not null and b.ds = '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n0
+POSTHOOK: Input: default@test_table1_n0@ds=1
+POSTHOOK: Input: default@test_table1_n0@ds=2
+POSTHOOK: Input: default@test_table2_n0
+POSTHOOK: Input: default@test_table2_n0@ds=1
+POSTHOOK: Output: default@test_table3_n0@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -522,12 +544,24 @@ SELECT a.key, concat(a.value, b.value)
 FROM test_table1_n0 a JOIN test_table2_n0 b 
 ON a.key = b.key WHERE a.ds = '1' and b.ds is not null
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n0
+PREHOOK: Input: default@test_table1_n0@ds=1
+PREHOOK: Input: default@test_table2_n0
+PREHOOK: Input: default@test_table2_n0@ds=1
+PREHOOK: Input: default@test_table2_n0@ds=2
+PREHOOK: Output: default@test_table3_n0@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3_n0 PARTITION (ds = '1')
 SELECT a.key, concat(a.value, b.value) 
 FROM test_table1_n0 a JOIN test_table2_n0 b 
 ON a.key = b.key WHERE a.ds = '1' and b.ds is not null
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n0
+POSTHOOK: Input: default@test_table1_n0@ds=1
+POSTHOOK: Input: default@test_table2_n0
+POSTHOOK: Input: default@test_table2_n0@ds=1
+POSTHOOK: Input: default@test_table2_n0@ds=2
+POSTHOOK: Output: default@test_table3_n0@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -757,6 +791,11 @@ JOIN
 (select key, value from test_table2_n0 where ds = '1') b 
 ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n0
+PREHOOK: Input: default@test_table1_n0@ds=1
+PREHOOK: Input: default@test_table2_n0
+PREHOOK: Input: default@test_table2_n0@ds=1
+PREHOOK: Output: default@test_table3_n0@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3_n0 PARTITION (ds = '1')
 SELECT a.key, concat(a.value, b.value) 
@@ -766,6 +805,11 @@ JOIN
 (select key, value from test_table2_n0 where ds = '1') b 
 ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n0
+POSTHOOK: Input: default@test_table1_n0@ds=1
+POSTHOOK: Input: default@test_table2_n0
+POSTHOOK: Input: default@test_table2_n0@ds=1
+POSTHOOK: Output: default@test_table3_n0@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -977,6 +1021,11 @@ JOIN
 (select key, concat(value, value) as v2 from test_table2_n0 where ds = '1') b 
 ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n0
+PREHOOK: Input: default@test_table1_n0@ds=1
+PREHOOK: Input: default@test_table2_n0
+PREHOOK: Input: default@test_table2_n0@ds=1
+PREHOOK: Output: default@test_table3_n0@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3_n0 PARTITION (ds = '1')
 SELECT a.key, concat(a.v1, b.v2) 
@@ -986,6 +1035,11 @@ JOIN
 (select key, concat(value, value) as v2 from test_table2_n0 where ds = '1') b 
 ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n0
+POSTHOOK: Input: default@test_table1_n0@ds=1
+POSTHOOK: Input: default@test_table2_n0
+POSTHOOK: Input: default@test_table2_n0@ds=1
+POSTHOOK: Output: default@test_table3_n0@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -1197,6 +1251,11 @@ JOIN
 (select key, value from test_table2_n0 where ds = '1') b 
 ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n0
+PREHOOK: Input: default@test_table1_n0@ds=1
+PREHOOK: Input: default@test_table2_n0
+PREHOOK: Input: default@test_table2_n0@ds=1
+PREHOOK: Output: default@test_table3_n0@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3_n0 PARTITION (ds = '1')
 SELECT a.key+a.key, concat(a.value, b.value) 
@@ -1206,6 +1265,11 @@ JOIN
 (select key, value from test_table2_n0 where ds = '1') b 
 ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n0
+POSTHOOK: Input: default@test_table1_n0@ds=1
+POSTHOOK: Input: default@test_table2_n0
+POSTHOOK: Input: default@test_table2_n0@ds=1
+POSTHOOK: Output: default@test_table3_n0@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_6.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_6.q.out 
b/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_6.q.out
index 7533cf8..a51e17b 100644
--- a/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_6.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_6.q.out
@@ -60,12 +60,22 @@ SELECT a.key, a.key2, concat(a.value, b.value)
 FROM test_table1_n3 a JOIN test_table2_n3 b 
 ON a.key = b.key and a.key2 = b.key2 WHERE a.ds = '1' and b.ds = '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n3
+PREHOOK: Input: default@test_table1_n3@ds=1
+PREHOOK: Input: default@test_table2_n3
+PREHOOK: Input: default@test_table2_n3@ds=1
+PREHOOK: Output: default@test_table3_n3@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3_n3 PARTITION (ds = '1')
 SELECT a.key, a.key2, concat(a.value, b.value) 
 FROM test_table1_n3 a JOIN test_table2_n3 b 
 ON a.key = b.key and a.key2 = b.key2 WHERE a.ds = '1' and b.ds = '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n3
+POSTHOOK: Input: default@test_table1_n3@ds=1
+POSTHOOK: Input: default@test_table2_n3
+POSTHOOK: Input: default@test_table2_n3@ds=1
+POSTHOOK: Output: default@test_table3_n3@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -272,6 +282,11 @@ FROM test_table1_n3 a JOIN test_table2_n3 b
 ON a.key = b.key and a.key2 = b.key2 WHERE a.ds = '1' and b.ds = '1'
 )subq1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n3
+PREHOOK: Input: default@test_table1_n3@ds=1
+PREHOOK: Input: default@test_table2_n3
+PREHOOK: Input: default@test_table2_n3@ds=1
+PREHOOK: Output: default@test_table3_n3@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3_n3 PARTITION (ds = '1')
 SELECT subq1.key, subq1.key2, subq1.value from
@@ -281,6 +296,11 @@ FROM test_table1_n3 a JOIN test_table2_n3 b
 ON a.key = b.key and a.key2 = b.key2 WHERE a.ds = '1' and b.ds = '1'
 )subq1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n3
+POSTHOOK: Input: default@test_table1_n3@ds=1
+POSTHOOK: Input: default@test_table2_n3
+POSTHOOK: Input: default@test_table2_n3@ds=1
+POSTHOOK: Output: default@test_table3_n3@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -490,12 +510,22 @@ SELECT a.key2, a.key, concat(a.value, b.value)
 FROM test_table1_n3 a JOIN test_table2_n3 b 
 ON a.key = b.key and a.key2 = b.key2 WHERE a.ds = '1' and b.ds = '1'
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n3
+PREHOOK: Input: default@test_table1_n3@ds=1
+PREHOOK: Input: default@test_table2_n3
+PREHOOK: Input: default@test_table2_n3@ds=1
+PREHOOK: Output: default@test_table3_n3@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3_n3 PARTITION (ds = '1')
 SELECT a.key2, a.key, concat(a.value, b.value) 
 FROM test_table1_n3 a JOIN test_table2_n3 b 
 ON a.key = b.key and a.key2 = b.key2 WHERE a.ds = '1' and b.ds = '1'
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n3
+POSTHOOK: Input: default@test_table1_n3@ds=1
+POSTHOOK: Input: default@test_table2_n3
+POSTHOOK: Input: default@test_table2_n3@ds=1
+POSTHOOK: Output: default@test_table3_n3@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -637,6 +667,11 @@ FROM test_table1_n3 a JOIN test_table2_n3 b
 ON a.key = b.key and a.key2 = b.key2 WHERE a.ds = '1' and b.ds = '1'
 )subq1
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n3
+PREHOOK: Input: default@test_table1_n3@ds=1
+PREHOOK: Input: default@test_table2_n3
+PREHOOK: Input: default@test_table2_n3@ds=1
+PREHOOK: Output: default@test_table3_n3@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3_n3 PARTITION (ds = '1')
 SELECT subq1.key2, subq1.key, subq1.value from
@@ -646,6 +681,11 @@ FROM test_table1_n3 a JOIN test_table2_n3 b
 ON a.key = b.key and a.key2 = b.key2 WHERE a.ds = '1' and b.ds = '1'
 )subq1
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n3
+POSTHOOK: Input: default@test_table1_n3@ds=1
+POSTHOOK: Input: default@test_table2_n3
+POSTHOOK: Input: default@test_table2_n3@ds=1
+POSTHOOK: Output: default@test_table3_n3@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -790,6 +830,11 @@ ON a.key = b.key and a.key2 = b.key2 WHERE a.ds = '1' and 
b.ds = '1'
 )subq1
 )subq2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n3
+PREHOOK: Input: default@test_table1_n3@ds=1
+PREHOOK: Input: default@test_table2_n3
+PREHOOK: Input: default@test_table2_n3@ds=1
+PREHOOK: Output: default@test_table3_n3@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3_n3 PARTITION (ds = '1')
 SELECT subq2.key, subq2.key2, subq2.value from
@@ -802,6 +847,11 @@ ON a.key = b.key and a.key2 = b.key2 WHERE a.ds = '1' and 
b.ds = '1'
 )subq1
 )subq2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n3
+POSTHOOK: Input: default@test_table1_n3@ds=1
+POSTHOOK: Input: default@test_table2_n3
+POSTHOOK: Input: default@test_table2_n3@ds=1
+POSTHOOK: Output: default@test_table3_n3@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -1023,6 +1073,11 @@ ON a.key = b.key and a.key2 = b.key2 WHERE a.ds = '1' 
and b.ds = '1'
 )subq1
 )subq2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n3
+PREHOOK: Input: default@test_table1_n3@ds=1
+PREHOOK: Input: default@test_table2_n3
+PREHOOK: Input: default@test_table2_n3@ds=1
+PREHOOK: Output: default@test_table3_n3@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3_n3 PARTITION (ds = '1')
 SELECT subq2.k2, subq2.k1, subq2.value from
@@ -1035,6 +1090,11 @@ ON a.key = b.key and a.key2 = b.key2 WHERE a.ds = '1' 
and b.ds = '1'
 )subq1
 )subq2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n3
+POSTHOOK: Input: default@test_table1_n3@ds=1
+POSTHOOK: Input: default@test_table2_n3
+POSTHOOK: Input: default@test_table2_n3@ds=1
+POSTHOOK: Output: default@test_table3_n3@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -1266,6 +1326,11 @@ ON a.key = b.key and a.key2 = b.key2 WHERE a.ds = '1' 
and b.ds = '1'
 )subq1
 )subq2
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n3
+PREHOOK: Input: default@test_table1_n3@ds=1
+PREHOOK: Input: default@test_table2_n3
+PREHOOK: Input: default@test_table2_n3@ds=1
+PREHOOK: Output: default@test_table4@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table4 PARTITION (ds = '1')
 SELECT subq2.k2, subq2.k1, subq2.value from
@@ -1278,6 +1343,11 @@ ON a.key = b.key and a.key2 = b.key2 WHERE a.ds = '1' 
and b.ds = '1'
 )subq1
 )subq2
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n3
+POSTHOOK: Input: default@test_table1_n3@ds=1
+POSTHOOK: Input: default@test_table2_n3
+POSTHOOK: Input: default@test_table2_n3@ds=1
+POSTHOOK: Output: default@test_table4@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_7.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_7.q.out 
b/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_7.q.out
index cf7e442..a8ed8e8 100644
--- a/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_7.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_7.q.out
@@ -59,6 +59,11 @@ FROM test_table1_n20 a JOIN test_table2_n19 b
 ON a.key = b.key WHERE a.ds = '1' and b.ds = '1'
 and (a.key = 0 or a.key = 5)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n20
+PREHOOK: Input: default@test_table1_n20@ds=1
+PREHOOK: Input: default@test_table2_n19
+PREHOOK: Input: default@test_table2_n19@ds=1
+PREHOOK: Output: default@test_table3_n11@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3_n11 PARTITION (ds = '1')
 SELECT a.key, concat(a.value, b.value) 
@@ -66,6 +71,11 @@ FROM test_table1_n20 a JOIN test_table2_n19 b
 ON a.key = b.key WHERE a.ds = '1' and b.ds = '1'
 and (a.key = 0 or a.key = 5)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n20
+POSTHOOK: Input: default@test_table1_n20@ds=1
+POSTHOOK: Input: default@test_table2_n19
+POSTHOOK: Input: default@test_table2_n19@ds=1
+POSTHOOK: Output: default@test_table3_n11@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -269,6 +279,11 @@ JOIN
 (select key, value from test_table2_n19 where ds = '1' and (key = 0 or key = 
5)) b 
 ON a.key = b.key
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n20
+PREHOOK: Input: default@test_table1_n20@ds=1
+PREHOOK: Input: default@test_table2_n19
+PREHOOK: Input: default@test_table2_n19@ds=1
+PREHOOK: Output: default@test_table3_n11@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3_n11 PARTITION (ds = '1')
 SELECT a.key, concat(a.value, b.value) 
@@ -278,6 +293,11 @@ JOIN
 (select key, value from test_table2_n19 where ds = '1' and (key = 0 or key = 
5)) b 
 ON a.key = b.key
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n20
+POSTHOOK: Input: default@test_table1_n20@ds=1
+POSTHOOK: Input: default@test_table2_n19
+POSTHOOK: Input: default@test_table2_n19@ds=1
+POSTHOOK: Output: default@test_table3_n11@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1
@@ -486,6 +506,11 @@ JOIN
 ON a.key = b.key
 WHERE a.key = 0 or a.key = 5
 PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table1_n20
+PREHOOK: Input: default@test_table1_n20@ds=1
+PREHOOK: Input: default@test_table2_n19
+PREHOOK: Input: default@test_table2_n19@ds=1
+PREHOOK: Output: default@test_table3_n11@ds=1
 POSTHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3_n11 PARTITION (ds = '1')
 SELECT a.key, concat(a.value, b.value) 
@@ -496,6 +521,11 @@ JOIN
 ON a.key = b.key
 WHERE a.key = 0 or a.key = 5
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table1_n20
+POSTHOOK: Input: default@test_table1_n20@ds=1
+POSTHOOK: Input: default@test_table2_n19
+POSTHOOK: Input: default@test_table2_n19@ds=1
+POSTHOOK: Output: default@test_table3_n11@ds=1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-2 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b356aae0/ql/src/test/results/clientpositive/llap/cbo_simple_select.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cbo_simple_select.q.out 
b/ql/src/test/results/clientpositive/llap/cbo_simple_select.q.out
index f964cb6..f6ce9a3 100644
--- a/ql/src/test/results/clientpositive/llap/cbo_simple_select.q.out
+++ b/ql/src/test/results/clientpositive/llap/cbo_simple_select.q.out
@@ -743,8 +743,14 @@ POSTHOOK: Input: default@cbo_t2@dt=2014
 400
 PREHOOK: query: EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN 
(cbo_t2.c_int)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t2
+PREHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 POSTHOOK: query: EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN 
(cbo_t2.c_int)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t2
+POSTHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -765,9 +771,15 @@ STAGE PLANS:
 PREHOOK: query: -- c_int is not null
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (2*cbo_t2.c_int)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t2
+PREHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 POSTHOOK: query: -- c_int is not null
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (2*cbo_t2.c_int)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t2
+POSTHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -788,9 +800,15 @@ STAGE PLANS:
 PREHOOK: query: -- c_int is 0
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) = (cbo_t2.c_int)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t2
+PREHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 POSTHOOK: query: -- c_int is 0
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) = (cbo_t2.c_int)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t2
+POSTHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -811,9 +829,15 @@ STAGE PLANS:
 PREHOOK: query: -- c_int is not null
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (NULL)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t2
+PREHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 POSTHOOK: query: -- c_int is not null
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (NULL)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t2
+POSTHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -834,9 +858,15 @@ STAGE PLANS:
 PREHOOK: query: -- rewrite to NULL
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (cbo_t2.c_int, 
2*cbo_t2.c_int)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t2
+PREHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 POSTHOOK: query: -- rewrite to NULL
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (cbo_t2.c_int, 
2*cbo_t2.c_int)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t2
+POSTHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -857,9 +887,15 @@ STAGE PLANS:
 PREHOOK: query: -- no rewrite
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (cbo_t2.c_int, 0)
 PREHOOK: type: QUERY
+PREHOOK: Input: default@cbo_t2
+PREHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 POSTHOOK: query: -- no rewrite
 EXPLAIN select * from cbo_t2 where (cbo_t2.c_int) IN (cbo_t2.c_int, 0)
 POSTHOOK: type: QUERY
+POSTHOOK: Input: default@cbo_t2
+POSTHOOK: Input: default@cbo_t2@dt=2014
+#### A masked pattern was here ####
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 

Reply via email to