http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/cte_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cte_4.q.out 
b/ql/src/test/results/clientpositive/llap/cte_4.q.out
index dbe4140..6621c0b 100644
--- a/ql/src/test/results/clientpositive/llap/cte_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/cte_4.q.out
@@ -8,7 +8,9 @@ PREHOOK: Input: default@src
 PREHOOK: Output: database:default
 PREHOOK: Output: default@q1
 PREHOOK: Output: default@q2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
+PREHOOK: Output: hdfs://### HDFS PATH ###
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: with q1 as (select * from src where key= '5'),
 q2 as (select * from src s2 where key = '4')
 select * from q1 union all select * from q2
@@ -19,7 +21,9 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@q1
 POSTHOOK: Output: default@q2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
+POSTHOOK: Output: hdfs://### HDFS PATH ###
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 5      val_5
 5      val_5
 5      val_5
@@ -42,7 +46,7 @@ PREHOOK: Input: default@src
 PREHOOK: Output: database:default
 PREHOOK: Output: default@q1
 PREHOOK: Output: default@s1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: with q1 as ( select key, value from src where key = '5')
 from q1
 insert overwrite table s1
@@ -53,17 +57,17 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@q1
 POSTHOOK: Output: default@s1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: Lineage: s1.key SIMPLE [(q1)q1.FieldSchema(name:key, type:string, 
comment:null), ]
 POSTHOOK: Lineage: s1.value SIMPLE [(q1)q1.FieldSchema(name:value, 
type:string, comment:null), ]
 PREHOOK: query: select * from s1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@s1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from s1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@s1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 5      val_5
 5      val_5
 5      val_5
@@ -83,7 +87,8 @@ PREHOOK: Input: default@q1
 PREHOOK: Input: default@src
 PREHOOK: Output: database:default
 PREHOOK: Output: default@q1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: with q1 as (select * from src where key= '5')
 from q1
 select *
@@ -92,7 +97,8 @@ POSTHOOK: Input: default@q1
 POSTHOOK: Input: default@src
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@q1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 5      val_5
 5      val_5
 5      val_5
@@ -105,7 +111,7 @@ PREHOOK: Input: default@src
 PREHOOK: Output: database:default
 PREHOOK: Output: default@q1
 PREHOOK: Output: default@s2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: create table s2 as
 with q1 as ( select key from src where key = '4')
 select * from q1
@@ -115,16 +121,16 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@q1
 POSTHOOK: Output: default@s2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: Lineage: s2.key SIMPLE [(q1)q1.FieldSchema(name:key, type:string, 
comment:null), ]
 PREHOOK: query: select * from s2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@s2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from s2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@s2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 4
 PREHOOK: query: drop table s2
 PREHOOK: type: DROPTABLE
@@ -153,12 +159,12 @@ PREHOOK: query: select * from v1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Input: default@v1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from v1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@v1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 5
 5
 5
@@ -190,13 +196,13 @@ select * from v1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Input: default@v1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: with q1 as ( select key from src where key = '4')
 select * from v1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@v1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 5
 5
 5

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning_2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning_2.q.out 
b/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning_2.q.out
index ff71fb2..aa4c7df 100644
--- a/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning_2.q.out
@@ -98,11 +98,11 @@ POSTHOOK: Output: default@agg_01@dim_shops_id=3
 PREHOOK: query: select * from dim_shops
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dim_shops
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from dim_shops
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dim_shops
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1      foo
 2      bar
 3      baz
@@ -112,14 +112,14 @@ PREHOOK: Input: default@agg_01
 PREHOOK: Input: default@agg_01@dim_shops_id=1
 PREHOOK: Input: default@agg_01@dim_shops_id=2
 PREHOOK: Input: default@agg_01@dim_shops_id=3
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from agg_01
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@agg_01
 POSTHOOK: Input: default@agg_01@dim_shops_id=1
 POSTHOOK: Input: default@agg_01@dim_shops_id=2
 POSTHOOK: Input: default@agg_01@dim_shops_id=3
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1      1
 2      1
 3      1
@@ -280,7 +280,7 @@ PREHOOK: Input: default@agg_01@dim_shops_id=1
 PREHOOK: Input: default@agg_01@dim_shops_id=2
 PREHOOK: Input: default@agg_01@dim_shops_id=3
 PREHOOK: Input: default@dim_shops
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT d1.label, count(*), sum(agg.amount)
 FROM agg_01 agg,
 dim_shops d1
@@ -295,7 +295,7 @@ POSTHOOK: Input: default@agg_01@dim_shops_id=1
 POSTHOOK: Input: default@agg_01@dim_shops_id=2
 POSTHOOK: Input: default@agg_01@dim_shops_id=3
 POSTHOOK: Input: default@dim_shops
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 bar    3       15
 foo    3       6
 PREHOOK: query: EXPLAIN SELECT d1.label, count(*), sum(agg.amount)
@@ -434,7 +434,7 @@ PREHOOK: Input: default@agg_01@dim_shops_id=1
 PREHOOK: Input: default@agg_01@dim_shops_id=2
 PREHOOK: Input: default@agg_01@dim_shops_id=3
 PREHOOK: Input: default@dim_shops
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT d1.label, count(*), sum(agg.amount)
 FROM agg_01 agg,
 dim_shops d1
@@ -449,7 +449,7 @@ POSTHOOK: Input: default@agg_01@dim_shops_id=1
 POSTHOOK: Input: default@agg_01@dim_shops_id=2
 POSTHOOK: Input: default@agg_01@dim_shops_id=3
 POSTHOOK: Input: default@dim_shops
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 bar    3       15
 foo    3       6
 PREHOOK: query: EXPLAIN SELECT d1.label
@@ -545,7 +545,7 @@ PREHOOK: Input: default@agg_01@dim_shops_id=1
 PREHOOK: Input: default@agg_01@dim_shops_id=2
 PREHOOK: Input: default@agg_01@dim_shops_id=3
 PREHOOK: Input: default@dim_shops
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT d1.label
 FROM agg_01 agg,
 dim_shops d1
@@ -556,7 +556,7 @@ POSTHOOK: Input: default@agg_01@dim_shops_id=1
 POSTHOOK: Input: default@agg_01@dim_shops_id=2
 POSTHOOK: Input: default@agg_01@dim_shops_id=3
 POSTHOOK: Input: default@dim_shops
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 foo
 foo
 foo
@@ -658,7 +658,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@agg_01
 PREHOOK: Input: default@agg_01@dim_shops_id=1
 PREHOOK: Input: default@dim_shops
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT agg.amount
 FROM agg_01 agg,
 dim_shops d1
@@ -668,7 +668,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@agg_01
 POSTHOOK: Input: default@agg_01@dim_shops_id=1
 POSTHOOK: Input: default@dim_shops
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1
 2
 3
@@ -823,7 +823,7 @@ PREHOOK: Input: default@agg_01@dim_shops_id=1
 PREHOOK: Input: default@agg_01@dim_shops_id=2
 PREHOOK: Input: default@agg_01@dim_shops_id=3
 PREHOOK: Input: default@dim_shops
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT d1.label, count(*), sum(agg.amount)
 FROM agg_01 agg,
 dim_shops d1
@@ -838,7 +838,7 @@ POSTHOOK: Input: default@agg_01@dim_shops_id=1
 POSTHOOK: Input: default@agg_01@dim_shops_id=2
 POSTHOOK: Input: default@agg_01@dim_shops_id=3
 POSTHOOK: Input: default@dim_shops
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 bar    3       15
 foo    3       6
 PREHOOK: query: EXPLAIN 
@@ -1010,7 +1010,7 @@ PREHOOK: Input: default@agg_01@dim_shops_id=1
 PREHOOK: Input: default@agg_01@dim_shops_id=2
 PREHOOK: Input: default@agg_01@dim_shops_id=3
 PREHOOK: Input: default@dim_shops
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT amount FROM agg_01, dim_shops WHERE dim_shops_id = id 
AND label = 'foo'
 UNION ALL
 SELECT amount FROM agg_01, dim_shops WHERE dim_shops_id = id AND label = 'bar'
@@ -1020,7 +1020,7 @@ POSTHOOK: Input: default@agg_01@dim_shops_id=1
 POSTHOOK: Input: default@agg_01@dim_shops_id=2
 POSTHOOK: Input: default@agg_01@dim_shops_id=3
 POSTHOOK: Input: default@dim_shops
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1
 2
 3
@@ -1131,7 +1131,7 @@ PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*)
 from srcpart s1,
      srcpart s2
@@ -1142,5 +1142,5 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 2000000

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/dynamic_semijoin_user_level.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_user_level.q.out 
b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_user_level.q.out
index dc6bf7e..af4004e 100644
--- a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_user_level.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_user_level.q.out
@@ -106,12 +106,12 @@ PREHOOK: query: analyze table alltypesorc_int compute 
statistics for columns
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc_int
 PREHOOK: Output: default@alltypesorc_int
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: analyze table alltypesorc_int compute statistics for columns
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc_int
 POSTHOOK: Output: default@alltypesorc_int
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: analyze table srcpart_date compute statistics for columns
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart_date
@@ -120,7 +120,7 @@ PREHOOK: Input: default@srcpart_date@ds=2008-04-09
 PREHOOK: Output: default@srcpart_date
 PREHOOK: Output: default@srcpart_date@ds=2008-04-08
 PREHOOK: Output: default@srcpart_date@ds=2008-04-09
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: analyze table srcpart_date compute statistics for columns
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart_date
@@ -129,7 +129,7 @@ POSTHOOK: Input: default@srcpart_date@ds=2008-04-09
 POSTHOOK: Output: default@srcpart_date
 POSTHOOK: Output: default@srcpart_date@ds=2008-04-08
 POSTHOOK: Output: default@srcpart_date@ds=2008-04-09
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: analyze table srcpart_small compute statistics for columns
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart_small
@@ -138,7 +138,7 @@ PREHOOK: Input: default@srcpart_small@ds=2008-04-09
 PREHOOK: Output: default@srcpart_small
 PREHOOK: Output: default@srcpart_small@ds=2008-04-08
 PREHOOK: Output: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: analyze table srcpart_small compute statistics for columns
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart_small
@@ -147,7 +147,7 @@ POSTHOOK: Input: default@srcpart_small@ds=2008-04-09
 POSTHOOK: Output: default@srcpart_small
 POSTHOOK: Output: default@srcpart_small@ds=2008-04-08
 POSTHOOK: Output: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: EXPLAIN select count(*) from srcpart_date join srcpart_small 
on (srcpart_date.key = srcpart_small.key1)
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN select count(*) from srcpart_date join srcpart_small 
on (srcpart_date.key = srcpart_small.key1)
@@ -212,7 +212,7 @@ PREHOOK: Input: default@srcpart_date@ds=2008-04-09
 PREHOOK: Input: default@srcpart_small
 PREHOOK: Input: default@srcpart_small@ds=2008-04-08
 PREHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from srcpart_date join srcpart_small on 
(srcpart_date.key = srcpart_small.key1)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart_date
@@ -221,7 +221,7 @@ POSTHOOK: Input: default@srcpart_date@ds=2008-04-09
 POSTHOOK: Input: default@srcpart_small
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-08
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 176
 PREHOOK: query: EXPLAIN select count(*) from srcpart_date join srcpart_small 
on (srcpart_date.key = srcpart_small.ds)
 PREHOOK: type: QUERY
@@ -278,7 +278,7 @@ PREHOOK: Input: default@srcpart_date@ds=2008-04-09
 PREHOOK: Input: default@srcpart_small
 PREHOOK: Input: default@srcpart_small@ds=2008-04-08
 PREHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from srcpart_date join srcpart_small on 
(srcpart_date.key = srcpart_small.ds)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart_date
@@ -287,7 +287,7 @@ POSTHOOK: Input: default@srcpart_date@ds=2008-04-09
 POSTHOOK: Input: default@srcpart_small
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-08
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0
 PREHOOK: query: EXPLAIN select count(*) from srcpart_date join srcpart_small 
on (srcpart_date.key = srcpart_small.key1) join alltypesorc_int on 
(srcpart_small.key1 = alltypesorc_int.cstring)
 PREHOOK: type: QUERY
@@ -350,7 +350,7 @@ PREHOOK: Input: default@srcpart_date@ds=2008-04-09
 PREHOOK: Input: default@srcpart_small
 PREHOOK: Input: default@srcpart_small@ds=2008-04-08
 PREHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from srcpart_date join srcpart_small on 
(srcpart_date.key = srcpart_small.key1) join alltypesorc_int on 
(srcpart_small.key1 = alltypesorc_int.cstring)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc_int
@@ -360,7 +360,7 @@ POSTHOOK: Input: default@srcpart_date@ds=2008-04-09
 POSTHOOK: Input: default@srcpart_small
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-08
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0
 PREHOOK: query: EXPLAIN select count(*) from srcpart_date join srcpart_small 
on (srcpart_date.key = srcpart_small.key1) join alltypesorc_int on 
(srcpart_small.key1 = alltypesorc_int.cstring)
 PREHOOK: type: QUERY
@@ -452,7 +452,7 @@ PREHOOK: Input: default@srcpart_date@ds=2008-04-09
 PREHOOK: Input: default@srcpart_small
 PREHOOK: Input: default@srcpart_small@ds=2008-04-08
 PREHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from srcpart_date join srcpart_small on 
(srcpart_date.key = srcpart_small.key1) join alltypesorc_int on 
(srcpart_small.key1 = alltypesorc_int.cstring)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc_int
@@ -462,7 +462,7 @@ POSTHOOK: Input: default@srcpart_date@ds=2008-04-09
 POSTHOOK: Input: default@srcpart_small
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-08
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0
 PREHOOK: query: EXPLAIN select count(*) from srcpart_date join srcpart_small 
on (srcpart_date.key = srcpart_small.key1 and srcpart_date.value = 
srcpart_small.value1)
 PREHOOK: type: QUERY
@@ -515,7 +515,7 @@ PREHOOK: Input: default@srcpart_date@ds=2008-04-09
 PREHOOK: Input: default@srcpart_small
 PREHOOK: Input: default@srcpart_small@ds=2008-04-08
 PREHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from srcpart_date join srcpart_small on 
(srcpart_date.key = srcpart_small.key1 and srcpart_date.value = 
srcpart_small.value1)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart_date
@@ -524,7 +524,7 @@ POSTHOOK: Input: default@srcpart_date@ds=2008-04-09
 POSTHOOK: Input: default@srcpart_small
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-08
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 176
 PREHOOK: query: EXPLAIN select count(*) from srcpart_date join srcpart_small 
on (srcpart_date.key = srcpart_small.key1 and srcpart_date.value = 
srcpart_small.value1)
 PREHOOK: type: QUERY
@@ -602,7 +602,7 @@ PREHOOK: Input: default@srcpart_date@ds=2008-04-09
 PREHOOK: Input: default@srcpart_small
 PREHOOK: Input: default@srcpart_small@ds=2008-04-08
 PREHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from srcpart_date join srcpart_small on 
(srcpart_date.key = srcpart_small.key1 and srcpart_date.value = 
srcpart_small.value1)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart_date
@@ -611,7 +611,7 @@ POSTHOOK: Input: default@srcpart_date@ds=2008-04-09
 POSTHOOK: Input: default@srcpart_small
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-08
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 176
 PREHOOK: query: EXPLAIN select count(*) from srcpart_date join srcpart_small 
on (srcpart_date.key = srcpart_small.key1) join alltypesorc_int on 
(srcpart_date.value = alltypesorc_int.cstring)
 PREHOOK: type: QUERY
@@ -680,7 +680,7 @@ PREHOOK: Input: default@srcpart_date@ds=2008-04-09
 PREHOOK: Input: default@srcpart_small
 PREHOOK: Input: default@srcpart_small@ds=2008-04-08
 PREHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from srcpart_date join srcpart_small on 
(srcpart_date.key = srcpart_small.key1) join alltypesorc_int on 
(srcpart_date.value = alltypesorc_int.cstring)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc_int
@@ -690,7 +690,7 @@ POSTHOOK: Input: default@srcpart_date@ds=2008-04-09
 POSTHOOK: Input: default@srcpart_small
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-08
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0
 PREHOOK: query: EXPLAIN select count(*) from srcpart_date join srcpart_small 
on (srcpart_date.key = srcpart_small.key1) join alltypesorc_int on 
(srcpart_date.value = alltypesorc_int.cstring)
 PREHOOK: type: QUERY
@@ -785,7 +785,7 @@ PREHOOK: Input: default@srcpart_date@ds=2008-04-09
 PREHOOK: Input: default@srcpart_small
 PREHOOK: Input: default@srcpart_small@ds=2008-04-08
 PREHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from srcpart_date join srcpart_small on 
(srcpart_date.key = srcpart_small.key1) join alltypesorc_int on 
(srcpart_date.value = alltypesorc_int.cstring)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc_int
@@ -795,7 +795,7 @@ POSTHOOK: Input: default@srcpart_date@ds=2008-04-09
 POSTHOOK: Input: default@srcpart_small
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-08
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0
 PREHOOK: query: EXPLAIN extended select count(*) from srcpart_date join 
srcpart_small on (srcpart_date.key = srcpart_small.key1)
 PREHOOK: type: QUERY
@@ -842,9 +842,10 @@ STAGE PLANS:
             Execution mode: llap
             LLAP IO: all inputs
             Path -> Alias:
-#### A masked pattern was here ####
+              hdfs://### HDFS PATH ### [srcpart_date]
+              hdfs://### HDFS PATH ### [srcpart_date]
             Path -> Partition:
-#### A masked pattern was here ####
+              hdfs://### HDFS PATH ### 
                 Partition
                   base file name: ds=2008-04-08
                   input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
@@ -855,6 +856,7 @@ STAGE PLANS:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                     bucket_count -1
 #### A masked pattern was here ####
+                    location hdfs://### HDFS PATH ###
                     name default.srcpart_date
                     numFiles 1
                     numRows 1000
@@ -877,6 +879,7 @@ STAGE PLANS:
                       columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
+                      location hdfs://### HDFS PATH ###
                       name default.srcpart_date
                       partition_columns ds
                       partition_columns.types string
@@ -887,7 +890,7 @@ STAGE PLANS:
                     serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
                     name: default.srcpart_date
                   name: default.srcpart_date
-#### A masked pattern was here ####
+              hdfs://### HDFS PATH ### 
                 Partition
                   base file name: ds=2008-04-09
                   input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
@@ -898,6 +901,7 @@ STAGE PLANS:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                     bucket_count -1
 #### A masked pattern was here ####
+                    location hdfs://### HDFS PATH ###
                     name default.srcpart_date
                     numFiles 1
                     numRows 1000
@@ -920,6 +924,7 @@ STAGE PLANS:
                       columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
+                      location hdfs://### HDFS PATH ###
                       name default.srcpart_date
                       partition_columns ds
                       partition_columns.types string
@@ -976,9 +981,10 @@ STAGE PLANS:
             Execution mode: llap
             LLAP IO: all inputs
             Path -> Alias:
-#### A masked pattern was here ####
+              hdfs://### HDFS PATH ### [srcpart_small]
+              hdfs://### HDFS PATH ### [srcpart_small]
             Path -> Partition:
-#### A masked pattern was here ####
+              hdfs://### HDFS PATH ### 
                 Partition
                   base file name: ds=2008-04-08
                   input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
@@ -989,6 +995,7 @@ STAGE PLANS:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key1":"true","value1":"true"}}
                     bucket_count -1
 #### A masked pattern was here ####
+                    location hdfs://### HDFS PATH ###
                     name default.srcpart_small
                     numFiles 0
                     numRows 0
@@ -1011,6 +1018,7 @@ STAGE PLANS:
                       columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
+                      location hdfs://### HDFS PATH ###
                       name default.srcpart_small
                       partition_columns ds
                       partition_columns.types string
@@ -1021,7 +1029,7 @@ STAGE PLANS:
                     serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
                     name: default.srcpart_small
                   name: default.srcpart_small
-#### A masked pattern was here ####
+              hdfs://### HDFS PATH ### 
                 Partition
                   base file name: ds=2008-04-09
                   input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
@@ -1032,6 +1040,7 @@ STAGE PLANS:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key1":"true","value1":"true"}}
                     bucket_count -1
 #### A masked pattern was here ####
+                    location hdfs://### HDFS PATH ###
                     name default.srcpart_small
                     numFiles 1
                     numRows 20
@@ -1054,6 +1063,7 @@ STAGE PLANS:
                       columns.comments 
                       columns.types string:string
 #### A masked pattern was here ####
+                      location hdfs://### HDFS PATH ###
                       name default.srcpart_small
                       partition_columns ds
                       partition_columns.types string
@@ -1103,10 +1113,10 @@ STAGE PLANS:
                 File Output Operator
                   compressed: false
                   GlobalTableId: 0
-#### A masked pattern was here ####
+                  directory: hdfs://### HDFS PATH ###
                   NumFilesPerFileSink: 1
                   Statistics: Num rows: 1 Data size: 8 Basic stats: PARTIAL 
Column stats: NONE
-#### A masked pattern was here ####
+                  Stats Publishing Key Prefix: hdfs://### HDFS PATH ###
                   table:
                       input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -1193,7 +1203,7 @@ PREHOOK: Input: default@srcpart_date@ds=2008-04-09
 PREHOOK: Input: default@srcpart_small
 PREHOOK: Input: default@srcpart_small@ds=2008-04-08
 PREHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from srcpart_date join srcpart_small on 
(srcpart_date.key = srcpart_small.key1)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart_date
@@ -1202,7 +1212,7 @@ POSTHOOK: Input: default@srcpart_date@ds=2008-04-09
 POSTHOOK: Input: default@srcpart_small
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-08
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 176
 PREHOOK: query: EXPLAIN select count(*) from srcpart_date join srcpart_small 
on (srcpart_date.key = srcpart_small.key1)
 PREHOOK: type: QUERY
@@ -1252,7 +1262,7 @@ PREHOOK: Input: default@srcpart_date@ds=2008-04-09
 PREHOOK: Input: default@srcpart_small
 PREHOOK: Input: default@srcpart_small@ds=2008-04-08
 PREHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from srcpart_date join srcpart_small on 
(srcpart_date.key = srcpart_small.key1)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpart_date
@@ -1261,7 +1271,7 @@ POSTHOOK: Input: default@srcpart_date@ds=2008-04-09
 POSTHOOK: Input: default@srcpart_small
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-08
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 176
 PREHOOK: query: EXPLAIN select count(*) from srcpart_date join srcpart_small 
on (srcpart_date.key = srcpart_small.key1) join alltypesorc_int on 
(srcpart_date.value = alltypesorc_int.cstring)
 PREHOOK: type: QUERY
@@ -1324,7 +1334,7 @@ PREHOOK: Input: default@srcpart_date@ds=2008-04-09
 PREHOOK: Input: default@srcpart_small
 PREHOOK: Input: default@srcpart_small@ds=2008-04-08
 PREHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from srcpart_date join srcpart_small on 
(srcpart_date.key = srcpart_small.key1) join alltypesorc_int on 
(srcpart_date.value = alltypesorc_int.cstring)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc_int
@@ -1334,7 +1344,7 @@ POSTHOOK: Input: default@srcpart_date@ds=2008-04-09
 POSTHOOK: Input: default@srcpart_small
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-08
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0
 PREHOOK: query: EXPLAIN select count(*) from srcpart_date join srcpart_small 
on (srcpart_date.key = srcpart_small.key1) join alltypesorc_int on 
(srcpart_date.value = alltypesorc_int.cstring)
 PREHOOK: type: QUERY
@@ -1397,7 +1407,7 @@ PREHOOK: Input: default@srcpart_date@ds=2008-04-09
 PREHOOK: Input: default@srcpart_small
 PREHOOK: Input: default@srcpart_small@ds=2008-04-08
 PREHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from srcpart_date join srcpart_small on 
(srcpart_date.key = srcpart_small.key1) join alltypesorc_int on 
(srcpart_date.value = alltypesorc_int.cstring)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc_int
@@ -1407,7 +1417,7 @@ POSTHOOK: Input: default@srcpart_date@ds=2008-04-09
 POSTHOOK: Input: default@srcpart_small
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-08
 POSTHOOK: Input: default@srcpart_small@ds=2008-04-09
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0
 PREHOOK: query: explain select * from alltypesorc_int join
                                       (select srcpart_date.key as key from 
srcpart_date

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/empty_dir_in_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/empty_dir_in_table.q.out 
b/ql/src/test/results/clientpositive/llap/empty_dir_in_table.q.out
index e804de3..c91a3e2 100644
--- a/ql/src/test/results/clientpositive/llap/empty_dir_in_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/empty_dir_in_table.q.out
@@ -1,21 +1,21 @@
-#### A masked pattern was here ####
+PREHOOK: query: create external table roottable (key string) row format 
delimited fields terminated by '\\t' stored as textfile location 'hdfs://### 
HDFS PATH ###'
 PREHOOK: type: CREATETABLE
-#### A masked pattern was here ####
+PREHOOK: Input: hdfs://### HDFS PATH ###
 PREHOOK: Output: database:default
 PREHOOK: Output: default@roottable
-#### A masked pattern was here ####
+POSTHOOK: query: create external table roottable (key string) row format 
delimited fields terminated by '\\t' stored as textfile location 'hdfs://### 
HDFS PATH ###'
 POSTHOOK: type: CREATETABLE
-#### A masked pattern was here ####
+POSTHOOK: Input: hdfs://### HDFS PATH ###
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@roottable
 PREHOOK: query: select count(*) from roottable
 PREHOOK: type: QUERY
 PREHOOK: Input: default@roottable
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from roottable
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@roottable
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0
 PREHOOK: query: insert into table roottable select key from src where (key < 
20) order by key
 PREHOOK: type: QUERY
@@ -29,18 +29,18 @@ POSTHOOK: Lineage: roottable.key SIMPLE 
[(src)src.FieldSchema(name:key, type:str
 PREHOOK: query: select count(*) from roottable
 PREHOOK: type: QUERY
 PREHOOK: Input: default@roottable
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from roottable
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@roottable
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 20
 PREHOOK: query: select count(*) from roottable
 PREHOOK: type: QUERY
 PREHOOK: Input: default@roottable
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from roottable
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@roottable
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 20

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/except_distinct.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/except_distinct.q.out 
b/ql/src/test/results/clientpositive/llap/except_distinct.q.out
index 20dbcc4..1e5937a 100644
--- a/ql/src/test/results/clientpositive/llap/except_distinct.q.out
+++ b/ql/src/test/results/clientpositive/llap/except_distinct.q.out
@@ -36,12 +36,12 @@ PREHOOK: query: select * from a except distinct select * 
from b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@a
 PREHOOK: Input: default@b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from a except distinct select * from b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@a
 POSTHOOK: Input: default@b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0
 PREHOOK: query: drop table a
 PREHOOK: type: DROPTABLE
@@ -99,105 +99,105 @@ PREHOOK: query: select * from a except distinct select * 
from b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@a
 PREHOOK: Input: default@b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from a except distinct select * from b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@a
 POSTHOOK: Input: default@b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1      3
 PREHOOK: query: select * from b except distinct select * from a
 PREHOOK: type: QUERY
 PREHOOK: Input: default@a
 PREHOOK: Input: default@b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from b except distinct select * from a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@a
 POSTHOOK: Input: default@b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 2      20
 PREHOOK: query: select * from b except distinct select * from a intersect 
distinct select * from b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@a
 PREHOOK: Input: default@b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from b except distinct select * from a intersect 
distinct select * from b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@a
 POSTHOOK: Input: default@b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 2      20
 PREHOOK: query: select * from b except distinct select * from a except 
distinct select * from b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@a
 PREHOOK: Input: default@b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from b except distinct select * from a except 
distinct select * from b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@a
 POSTHOOK: Input: default@b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: select * from a except distinct select * from b union all 
select * from a except distinct select * from b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@a
 PREHOOK: Input: default@b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from a except distinct select * from b union all 
select * from a except distinct select * from b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@a
 POSTHOOK: Input: default@b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1      3
 PREHOOK: query: select * from a except distinct select * from b union select * 
from a except distinct select * from b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@a
 PREHOOK: Input: default@b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from a except distinct select * from b union select 
* from a except distinct select * from b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@a
 POSTHOOK: Input: default@b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1      3
 PREHOOK: query: select * from a except distinct select * from b except 
distinct select * from a except distinct select * from b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@a
 PREHOOK: Input: default@b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from a except distinct select * from b except 
distinct select * from a except distinct select * from b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@a
 POSTHOOK: Input: default@b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: select * from (select a.key, b.value from a join b on 
a.key=b.key)sub1 
 except distinct 
 select * from (select a.key, b.value from a join b on a.key=b.key)sub2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@a
 PREHOOK: Input: default@b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from (select a.key, b.value from a join b on 
a.key=b.key)sub1 
 except distinct 
 select * from (select a.key, b.value from a join b on a.key=b.key)sub2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@a
 POSTHOOK: Input: default@b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: select * from (select a.key, b.value from a join b on 
a.key=b.key)sub1
 except distinct
 select * from (select b.value as key, a.key as value from a join b on 
a.key=b.key)sub2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@a
 PREHOOK: Input: default@b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from (select a.key, b.value from a join b on 
a.key=b.key)sub1
 except distinct
 select * from (select b.value as key, a.key as value from a join b on 
a.key=b.key)sub2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@a
 POSTHOOK: Input: default@b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 2      3
 2      20
 1      2
@@ -358,11 +358,11 @@ STAGE PLANS:
 PREHOOK: query: select * from src except distinct select * from src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from src except distinct select * from src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain select * from src except distinct select * from src 
except distinct select * from src except distinct select * from src
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from src except distinct select * from src 
except distinct select * from src except distinct select * from src
@@ -682,11 +682,11 @@ STAGE PLANS:
 PREHOOK: query: select * from src except distinct select * from src except 
distinct select * from src except distinct select * from src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from src except distinct select * from src except 
distinct select * from src except distinct select * from src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain select value from a group by value except distinct 
select key from b group by key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select value from a group by value except distinct 
select key from b group by key
@@ -851,10 +851,10 @@ PREHOOK: query: select value from a group by value except 
distinct select key fr
 PREHOOK: type: QUERY
 PREHOOK: Input: default@a
 PREHOOK: Input: default@b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select value from a group by value except distinct select key 
from b group by key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@a
 POSTHOOK: Input: default@b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 3

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/explainuser_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/explainuser_2.q.out 
b/ql/src/test/results/clientpositive/llap/explainuser_2.q.out
index 7bcaca3..502fcfe 100644
--- a/ql/src/test/results/clientpositive/llap/explainuser_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/explainuser_2.q.out
@@ -128,12 +128,12 @@ PREHOOK: query: ANALYZE TABLE ss COMPUTE STATISTICS FOR 
COLUMNS k1,v1,k2,v2,k3,v
 PREHOOK: type: QUERY
 PREHOOK: Input: default@ss
 PREHOOK: Output: default@ss
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: ANALYZE TABLE ss COMPUTE STATISTICS FOR COLUMNS 
k1,v1,k2,v2,k3,v3
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@ss
 POSTHOOK: Output: default@ss
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: ANALYZE TABLE sr COMPUTE STATISTICS
 PREHOOK: type: QUERY
 PREHOOK: Input: default@sr
@@ -146,12 +146,12 @@ PREHOOK: query: ANALYZE TABLE sr COMPUTE STATISTICS FOR 
COLUMNS k1,v1,k2,v2,k3,v
 PREHOOK: type: QUERY
 PREHOOK: Input: default@sr
 PREHOOK: Output: default@sr
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: ANALYZE TABLE sr COMPUTE STATISTICS FOR COLUMNS 
k1,v1,k2,v2,k3,v3
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@sr
 POSTHOOK: Output: default@sr
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: ANALYZE TABLE cs COMPUTE STATISTICS
 PREHOOK: type: QUERY
 PREHOOK: Input: default@cs
@@ -164,12 +164,12 @@ PREHOOK: query: ANALYZE TABLE cs COMPUTE STATISTICS FOR 
COLUMNS k1,v1,k2,v2,k3,v
 PREHOOK: type: QUERY
 PREHOOK: Input: default@cs
 PREHOOK: Output: default@cs
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: ANALYZE TABLE cs COMPUTE STATISTICS FOR COLUMNS 
k1,v1,k2,v2,k3,v3
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cs
 POSTHOOK: Output: default@cs
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: EXPLAIN
 SELECT x.key, z.value, y.value
 FROM src1 x JOIN src y ON (x.key = y.key) 

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/external_table_with_space_in_location_path.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/external_table_with_space_in_location_path.q.out
 
b/ql/src/test/results/clientpositive/llap/external_table_with_space_in_location_path.q.out
index 831e339..e8fe19f 100644
--- 
a/ql/src/test/results/clientpositive/llap/external_table_with_space_in_location_path.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/external_table_with_space_in_location_path.q.out
@@ -1,32 +1,32 @@
 #### A masked pattern was here ####
 PREHOOK: type: CREATETABLE
-#### A masked pattern was here ####
+PREHOOK: Input: hdfs://### HDFS PATH ###+with space
 PREHOOK: Output: database:default
 PREHOOK: Output: default@spacetest
 #### A masked pattern was here ####
 POSTHOOK: type: CREATETABLE
-#### A masked pattern was here ####
+POSTHOOK: Input: hdfs://### HDFS PATH ###+with space
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@spacetest
 PREHOOK: query: SELECT * FROM spacetest
 PREHOOK: type: QUERY
 PREHOOK: Input: default@spacetest
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT * FROM spacetest
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@spacetest
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 12     jason
 13     steven
 15     joe
 PREHOOK: query: SELECT count(*) FROM spacetest
 PREHOOK: type: QUERY
 PREHOOK: Input: default@spacetest
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT count(*) FROM spacetest
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@spacetest
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 3
 PREHOOK: query: DROP TABLE spacetest
 PREHOOK: type: DROPTABLE
@@ -46,23 +46,23 @@ POSTHOOK: Output: database:default
 POSTHOOK: Output: default@spacetestpartition
 #### A masked pattern was here ####
 PREHOOK: type: ALTERTABLE_ADDPARTS
-#### A masked pattern was here ####
+PREHOOK: Input: hdfs://### HDFS PATH ###+with space
 PREHOOK: Output: default@spacetestpartition
 #### A masked pattern was here ####
 POSTHOOK: type: ALTERTABLE_ADDPARTS
-#### A masked pattern was here ####
+POSTHOOK: Input: hdfs://### HDFS PATH ###+with space
 POSTHOOK: Output: default@spacetestpartition
 POSTHOOK: Output: default@spacetestpartition@day=10
 PREHOOK: query: SELECT * FROM spacetestpartition
 PREHOOK: type: QUERY
 PREHOOK: Input: default@spacetestpartition
 PREHOOK: Input: default@spacetestpartition@day=10
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT * FROM spacetestpartition
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@spacetestpartition
 POSTHOOK: Input: default@spacetestpartition@day=10
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 12     jason   10
 13     steven  10
 15     joe     10
@@ -70,12 +70,12 @@ PREHOOK: query: SELECT count(*) FROM spacetestpartition
 PREHOOK: type: QUERY
 PREHOOK: Input: default@spacetestpartition
 PREHOOK: Input: default@spacetestpartition@day=10
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT count(*) FROM spacetestpartition
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@spacetestpartition
 POSTHOOK: Input: default@spacetestpartition@day=10
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 3
 PREHOOK: query: DROP TABLE spacetestpartition
 PREHOOK: type: DROPTABLE

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/file_with_header_footer.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/file_with_header_footer.q.out 
b/ql/src/test/results/clientpositive/llap/file_with_header_footer.q.out
index ca3dadb..e16df6b 100644
--- a/ql/src/test/results/clientpositive/llap/file_with_header_footer.q.out
+++ b/ql/src/test/results/clientpositive/llap/file_with_header_footer.q.out
@@ -1,21 +1,21 @@
 #### A masked pattern was here ####
 PREHOOK: type: CREATETABLE
-#### A masked pattern was here ####
+PREHOOK: Input: hdfs://### HDFS PATH ###
 PREHOOK: Output: database:default
 PREHOOK: Output: default@header_footer_table_1
 #### A masked pattern was here ####
 POSTHOOK: type: CREATETABLE
-#### A masked pattern was here ####
+POSTHOOK: Input: hdfs://### HDFS PATH ###
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@header_footer_table_1
 PREHOOK: query: SELECT * FROM header_footer_table_1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@header_footer_table_1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT * FROM header_footer_table_1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@header_footer_table_1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 steven hive    1
 dave   oozie   2
 xifa   phd     3
@@ -30,11 +30,11 @@ david3      oozie   22
 PREHOOK: query: SELECT * FROM header_footer_table_1 WHERE id < 50
 PREHOOK: type: QUERY
 PREHOOK: Input: default@header_footer_table_1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT * FROM header_footer_table_1 WHERE id < 50
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@header_footer_table_1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 steven hive    1
 dave   oozie   2
 xifa   phd     3
@@ -54,31 +54,31 @@ POSTHOOK: query: CREATE EXTERNAL TABLE 
header_footer_table_2 (name string, messa
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@header_footer_table_2
-#### A masked pattern was here ####
+PREHOOK: query: ALTER TABLE header_footer_table_2 ADD PARTITION (year=2012, 
month=1, day=1) location 'hdfs://### HDFS PATH ###'
 PREHOOK: type: ALTERTABLE_ADDPARTS
-#### A masked pattern was here ####
+PREHOOK: Input: hdfs://### HDFS PATH ###
 PREHOOK: Output: default@header_footer_table_2
-#### A masked pattern was here ####
+POSTHOOK: query: ALTER TABLE header_footer_table_2 ADD PARTITION (year=2012, 
month=1, day=1) location 'hdfs://### HDFS PATH ###'
 POSTHOOK: type: ALTERTABLE_ADDPARTS
-#### A masked pattern was here ####
+POSTHOOK: Input: hdfs://### HDFS PATH ###
 POSTHOOK: Output: default@header_footer_table_2
 POSTHOOK: Output: default@header_footer_table_2@year=2012/month=1/day=1
-#### A masked pattern was here ####
+PREHOOK: query: ALTER TABLE header_footer_table_2 ADD PARTITION (year=2012, 
month=1, day=2) location 'hdfs://### HDFS PATH ###'
 PREHOOK: type: ALTERTABLE_ADDPARTS
-#### A masked pattern was here ####
+PREHOOK: Input: hdfs://### HDFS PATH ###
 PREHOOK: Output: default@header_footer_table_2
-#### A masked pattern was here ####
+POSTHOOK: query: ALTER TABLE header_footer_table_2 ADD PARTITION (year=2012, 
month=1, day=2) location 'hdfs://### HDFS PATH ###'
 POSTHOOK: type: ALTERTABLE_ADDPARTS
-#### A masked pattern was here ####
+POSTHOOK: Input: hdfs://### HDFS PATH ###
 POSTHOOK: Output: default@header_footer_table_2
 POSTHOOK: Output: default@header_footer_table_2@year=2012/month=1/day=2
-#### A masked pattern was here ####
+PREHOOK: query: ALTER TABLE header_footer_table_2 ADD PARTITION (year=2012, 
month=1, day=3) location 'hdfs://### HDFS PATH ###'
 PREHOOK: type: ALTERTABLE_ADDPARTS
-#### A masked pattern was here ####
+PREHOOK: Input: hdfs://### HDFS PATH ###
 PREHOOK: Output: default@header_footer_table_2
-#### A masked pattern was here ####
+POSTHOOK: query: ALTER TABLE header_footer_table_2 ADD PARTITION (year=2012, 
month=1, day=3) location 'hdfs://### HDFS PATH ###'
 POSTHOOK: type: ALTERTABLE_ADDPARTS
-#### A masked pattern was here ####
+POSTHOOK: Input: hdfs://### HDFS PATH ###
 POSTHOOK: Output: default@header_footer_table_2
 POSTHOOK: Output: default@header_footer_table_2@year=2012/month=1/day=3
 PREHOOK: query: SELECT * FROM header_footer_table_2
@@ -87,14 +87,14 @@ PREHOOK: Input: default@header_footer_table_2
 PREHOOK: Input: default@header_footer_table_2@year=2012/month=1/day=1
 PREHOOK: Input: default@header_footer_table_2@year=2012/month=1/day=2
 PREHOOK: Input: default@header_footer_table_2@year=2012/month=1/day=3
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT * FROM header_footer_table_2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@header_footer_table_2
 POSTHOOK: Input: default@header_footer_table_2@year=2012/month=1/day=1
 POSTHOOK: Input: default@header_footer_table_2@year=2012/month=1/day=2
 POSTHOOK: Input: default@header_footer_table_2@year=2012/month=1/day=3
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 steven hive    1       2012    1       1
 dave   oozie   2       2012    1       1
 xifa   phd     3       2012    1       1
@@ -112,14 +112,14 @@ PREHOOK: Input: default@header_footer_table_2
 PREHOOK: Input: default@header_footer_table_2@year=2012/month=1/day=1
 PREHOOK: Input: default@header_footer_table_2@year=2012/month=1/day=2
 PREHOOK: Input: default@header_footer_table_2@year=2012/month=1/day=3
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT * FROM header_footer_table_2 WHERE id < 50
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@header_footer_table_2
 POSTHOOK: Input: default@header_footer_table_2@year=2012/month=1/day=1
 POSTHOOK: Input: default@header_footer_table_2@year=2012/month=1/day=2
 POSTHOOK: Input: default@header_footer_table_2@year=2012/month=1/day=3
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 steven hive    1       2012    1       1
 dave   oozie   2       2012    1       1
 xifa   phd     3       2012    1       1
@@ -133,30 +133,30 @@ shanyu2   senior  15      2012    1       2
 david3 oozie   22      2012    1       3
 #### A masked pattern was here ####
 PREHOOK: type: CREATETABLE
-#### A masked pattern was here ####
+PREHOOK: Input: hdfs://### HDFS PATH ###
 PREHOOK: Output: database:default
 PREHOOK: Output: default@emptytable
 #### A masked pattern was here ####
 POSTHOOK: type: CREATETABLE
-#### A masked pattern was here ####
+POSTHOOK: Input: hdfs://### HDFS PATH ###
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@emptytable
 PREHOOK: query: SELECT * FROM emptytable
 PREHOOK: type: QUERY
 PREHOOK: Input: default@emptytable
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT * FROM emptytable
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@emptytable
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: SELECT * FROM emptytable WHERE id < 50
 PREHOOK: type: QUERY
 PREHOOK: Input: default@emptytable
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT * FROM emptytable WHERE id < 50
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@emptytable
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: DROP TABLE header_footer_table_1
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@header_footer_table_1

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/global_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/global_limit.q.out 
b/ql/src/test/results/clientpositive/llap/global_limit.q.out
index 3c2795a..51a7374 100644
--- a/ql/src/test/results/clientpositive/llap/global_limit.q.out
+++ b/ql/src/test/results/clientpositive/llap/global_limit.q.out
@@ -60,20 +60,20 @@ POSTHOOK: Lineage: gl_tgt.key SIMPLE 
[(gl_src1)gl_src1.FieldSchema(name:key, typ
 PREHOOK: query: select * from gl_tgt ORDER BY key ASC
 PREHOOK: type: QUERY
 PREHOOK: Input: default@gl_tgt
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from gl_tgt ORDER BY key ASC
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@gl_tgt
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 165
 PREHOOK: query: select 'x' as key_new , split(value,',') as value_new from 
gl_src1 ORDER BY key_new ASC, value_new[0] ASC limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select 'x' as key_new , split(value,',') as value_new from 
gl_src1 ORDER BY key_new ASC, value_new[0] ASC limit 20
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 x      ["val_0"]
 x      ["val_0"]
 x      ["val_0"]
@@ -97,11 +97,11 @@ x   ["val_114"]
 PREHOOK: query: select key, value, split(value,',') as value_new from gl_src1 
ORDER BY key ASC, value ASC, value_new[0] ASC limit 30
 PREHOOK: type: QUERY
 PREHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select key, value, split(value,',') as value_new from gl_src1 
ORDER BY key ASC, value ASC, value_new[0] ASC limit 30
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0      val_0   ["val_0"]
 0      val_0   ["val_0"]
 0      val_0   ["val_0"]
@@ -135,11 +135,11 @@ POSTHOOK: Input: default@gl_src1
 PREHOOK: query: select key from gl_src1 ORDER BY key ASC limit 100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select key from gl_src1 ORDER BY key ASC limit 100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0
 0
 0
@@ -243,11 +243,11 @@ POSTHOOK: Input: default@gl_src1
 PREHOOK: query: select key from gl_src1 ORDER BY key ASC limit 30
 PREHOOK: type: QUERY
 PREHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select key from gl_src1 ORDER BY key ASC limit 30
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0
 0
 0
@@ -281,11 +281,11 @@ POSTHOOK: Input: default@gl_src1
 PREHOOK: query: select key, count(1) from gl_src1 group by key ORDER BY key 
ASC limit 5
 PREHOOK: type: QUERY
 PREHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select key, count(1) from gl_src1 group by key ORDER BY key 
ASC limit 5
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0      9
 4      3
 8      3
@@ -294,11 +294,11 @@ POSTHOOK: Input: default@gl_src1
 PREHOOK: query: select distinct key from gl_src1 ORDER BY key ASC limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select distinct key from gl_src1 ORDER BY key ASC limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0
 4
 8
@@ -312,22 +312,22 @@ POSTHOOK: Input: default@gl_src1
 PREHOOK: query: select count(1) from gl_src1 limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(1) from gl_src1 limit 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 354
 PREHOOK: query: select transform(*) using "tr _ \n" as t from
 (select "a_a_a_a_a_a_" from gl_src1 limit 100) subq ORDER BY t
 PREHOOK: type: QUERY
 PREHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select transform(*) using "tr _ \n" as t from
 (select "a_a_a_a_a_a_" from gl_src1 limit 100) subq ORDER BY t
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 
 
 
@@ -1031,11 +1031,11 @@ a
 PREHOOK: query: select key from (select * from (select key,value from 
gl_src1)t1 limit 10)t2 ORDER BY key ASC limit 2000
 PREHOOK: type: QUERY
 PREHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select key from (select * from (select key,value from 
gl_src1)t1 limit 10)t2 ORDER BY key ASC limit 2000
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 37
 66
 150
@@ -1049,11 +1049,11 @@ POSTHOOK: Input: default@gl_src1
 PREHOOK: query: select key from (select * from (select key,value from gl_src1 
limit 10)t1 )t2 ORDER BY key ASC
 PREHOOK: type: QUERY
 PREHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select key from (select * from (select key,value from gl_src1 
limit 10)t1 )t2 ORDER BY key ASC
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 37
 66
 150
@@ -1067,11 +1067,11 @@ POSTHOOK: Input: default@gl_src1
 PREHOOK: query: select key from (select * from (select key,value from 
gl_src1)t1 limit 10)t2 ORDER BY key ASC
 PREHOOK: type: QUERY
 PREHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select key from (select * from (select key,value from 
gl_src1)t1 limit 10)t2 ORDER BY key ASC
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 37
 66
 150
@@ -1094,11 +1094,11 @@ POSTHOOK: Lineage: gl_tgt.key EXPRESSION 
[(gl_src1)gl_src1.FieldSchema(name:key,
 PREHOOK: query: select * from gl_tgt ORDER BY key ASC
 PREHOOK: type: QUERY
 PREHOOK: Input: default@gl_tgt
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from gl_tgt ORDER BY key ASC
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@gl_tgt
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 38
 67
 151
@@ -1120,11 +1120,11 @@ POSTHOOK: Output: default@gl_src2
 PREHOOK: query: select key from gl_src2 ORDER BY key ASC limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@gl_src2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select key from gl_src2 ORDER BY key ASC limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@gl_src2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: create table gl_src_part1 (key int, value string) partitioned 
by (p string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
@@ -1172,13 +1172,13 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@gl_src_part1
 PREHOOK: Input: default@gl_src_part1@p=11
 PREHOOK: Input: default@gl_src_part1@p=12
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select key from gl_src_part1 where p like '1%' ORDER BY key 
ASC limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@gl_src_part1
 POSTHOOK: Input: default@gl_src_part1@p=11
 POSTHOOK: Input: default@gl_src_part1@p=12
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0
 0
 0
@@ -1193,12 +1193,12 @@ PREHOOK: query: select key from gl_src_part1 where 
p='11' ORDER BY key ASC limit
 PREHOOK: type: QUERY
 PREHOOK: Input: default@gl_src_part1
 PREHOOK: Input: default@gl_src_part1@p=11
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select key from gl_src_part1 where p='11' ORDER BY key ASC 
limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@gl_src_part1
 POSTHOOK: Input: default@gl_src_part1@p=11
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 5
 5
 5
@@ -1213,12 +1213,12 @@ PREHOOK: query: select key from gl_src_part1 where 
p='12' ORDER BY key ASC limit
 PREHOOK: type: QUERY
 PREHOOK: Input: default@gl_src_part1
 PREHOOK: Input: default@gl_src_part1@p=12
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select key from gl_src_part1 where p='12' ORDER BY key ASC 
limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@gl_src_part1
 POSTHOOK: Input: default@gl_src_part1@p=12
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0
 0
 0
@@ -1232,11 +1232,11 @@ POSTHOOK: Input: default@gl_src_part1@p=12
 PREHOOK: query: select key from gl_src_part1 where p='13' ORDER BY key ASC 
limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@gl_src_part1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select key from gl_src_part1 where p='13' ORDER BY key ASC 
limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@gl_src_part1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: alter table gl_src_part1 add partition (p='13')
 PREHOOK: type: ALTERTABLE_ADDPARTS
 PREHOOK: Output: default@gl_src_part1
@@ -1248,22 +1248,22 @@ PREHOOK: query: select key from gl_src_part1 where 
p='13' ORDER BY key ASC limit
 PREHOOK: type: QUERY
 PREHOOK: Input: default@gl_src_part1
 PREHOOK: Input: default@gl_src_part1@p=13
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select key from gl_src_part1 where p='13' ORDER BY key ASC 
limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@gl_src_part1
 POSTHOOK: Input: default@gl_src_part1@p=13
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: select key from gl_src_part1 where p='12' ORDER BY key ASC 
limit 1000
 PREHOOK: type: QUERY
 PREHOOK: Input: default@gl_src_part1
 PREHOOK: Input: default@gl_src_part1@p=12
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select key from gl_src_part1 where p='12' ORDER BY key ASC 
limit 1000
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@gl_src_part1
 POSTHOOK: Input: default@gl_src_part1@p=12
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0
 0
 0
@@ -1621,11 +1621,11 @@ POSTHOOK: Input: default@gl_src_part1@p=12
 PREHOOK: query: select * from gl_src1 limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from gl_src1 limit 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@gl_src1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 165    val_165
 PREHOOK: query: drop table gl_src1
 PREHOOK: type: DROPTABLE

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/import_exported_table.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/import_exported_table.q.out 
b/ql/src/test/results/clientpositive/llap/import_exported_table.q.out
index 65d7480..68d3dd8 100644
--- a/ql/src/test/results/clientpositive/llap/import_exported_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/import_exported_table.q.out
@@ -1,10 +1,10 @@
 #### A masked pattern was here ####
 PREHOOK: type: IMPORT
-#### A masked pattern was here ####
+PREHOOK: Input: hdfs://### HDFS PATH ###
 PREHOOK: Output: database:default
 #### A masked pattern was here ####
 POSTHOOK: type: IMPORT
-#### A masked pattern was here ####
+POSTHOOK: Input: hdfs://### HDFS PATH ###
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@j1_41
 PREHOOK: query: DESCRIBE j1_41
@@ -18,11 +18,11 @@ b                           int
 PREHOOK: query: SELECT * from j1_41
 PREHOOK: type: QUERY
 PREHOOK: Input: default@j1_41
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT * from j1_41
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@j1_41
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 johndee        1
 burks  2
 #### A masked pattern was here ####

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/insert_into1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/insert_into1.q.out 
b/ql/src/test/results/clientpositive/llap/insert_into1.q.out
index 5cc9b1d..844e5e4 100644
--- a/ql/src/test/results/clientpositive/llap/insert_into1.q.out
+++ b/ql/src/test/results/clientpositive/llap/insert_into1.q.out
@@ -132,13 +132,13 @@ PREHOOK: query: SELECT SUM(HASH(c)) FROM (
 ) t
 PREHOOK: type: QUERY
 PREHOOK: Input: default@insert_into1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM insert_into1
 ) t
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 -1142373758
 PREHOOK: query: explain 
 select count(*) from insert_into1
@@ -159,11 +159,11 @@ STAGE PLANS:
 PREHOOK: query: select count(*) from insert_into1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@insert_into1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from insert_into1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 100
 PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src ORDER 
BY key LIMIT 100
 PREHOOK: type: QUERY
@@ -287,13 +287,13 @@ PREHOOK: query: SELECT SUM(HASH(c)) FROM (
 ) t
 PREHOOK: type: QUERY
 PREHOOK: Input: default@insert_into1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM insert_into1
 ) t
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 -2284747516
 PREHOOK: query: explain
 SELECT COUNT(*) FROM insert_into1
@@ -314,11 +314,11 @@ STAGE PLANS:
 PREHOOK: query: select count(*) from insert_into1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@insert_into1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from insert_into1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 200
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src 
ORDER BY key LIMIT 10
 PREHOOK: type: QUERY
@@ -442,13 +442,13 @@ PREHOOK: query: SELECT SUM(HASH(c)) FROM (
 ) t
 PREHOOK: type: QUERY
 PREHOOK: Input: default@insert_into1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM insert_into1
 ) t
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 -2693537120
 PREHOOK: query: explain
 SELECT COUNT(*) FROM insert_into1
@@ -469,11 +469,11 @@ STAGE PLANS:
 PREHOOK: query: select count(*) from insert_into1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@insert_into1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from insert_into1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 10
 PREHOOK: query: explain insert overwrite table insert_into1 select 1, 'a'
 PREHOOK: type: QUERY
@@ -674,11 +674,11 @@ POSTHOOK: Lineage: insert_into1.value SIMPLE []
 PREHOOK: query: select * from insert_into1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@insert_into1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from insert_into1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1      a
 2      b
 PREHOOK: query: explain
@@ -809,11 +809,11 @@ STAGE PLANS:
 PREHOOK: query: select count(*) from insert_into1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@insert_into1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from insert_into1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 3
 PREHOOK: query: DROP TABLE insert_into1
 PREHOOK: type: DROPTABLE

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/insert_into2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/insert_into2.q.out 
b/ql/src/test/results/clientpositive/llap/insert_into2.q.out
index 3fb0d64..2a97bfd 100644
--- a/ql/src/test/results/clientpositive/llap/insert_into2.q.out
+++ b/ql/src/test/results/clientpositive/llap/insert_into2.q.out
@@ -160,11 +160,11 @@ STAGE PLANS:
 PREHOOK: query: select count (*) from insert_into2 where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@insert_into2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count (*) from insert_into2 where ds = '1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 100
 PREHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * 
FROM src order by key limit 100
 PREHOOK: type: QUERY
@@ -195,11 +195,11 @@ STAGE PLANS:
 PREHOOK: query: SELECT COUNT(*) FROM insert_into2 WHERE ds='1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@insert_into2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT COUNT(*) FROM insert_into2 WHERE ds='1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 200
 PREHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM insert_into2
@@ -207,14 +207,14 @@ PREHOOK: query: SELECT SUM(HASH(c)) FROM (
 PREHOOK: type: QUERY
 PREHOOK: Input: default@insert_into2
 PREHOOK: Input: default@insert_into2@ds=1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM insert_into2
 ) t
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into2
 POSTHOOK: Input: default@insert_into2@ds=1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 -39568181484
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2')
   SELECT * FROM src order by key LIMIT 100
@@ -354,7 +354,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@insert_into2
 PREHOOK: Input: default@insert_into2@ds=1
 PREHOOK: Input: default@insert_into2@ds=2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM insert_into2
 ) t
@@ -362,7 +362,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into2
 POSTHOOK: Input: default@insert_into2@ds=1
 POSTHOOK: Input: default@insert_into2@ds=2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 -59352272126
 PREHOOK: query: explain
 SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
@@ -383,11 +383,11 @@ STAGE PLANS:
 PREHOOK: query: SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@insert_into2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 100
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2')
   SELECT * FROM src order by key LIMIT 50
@@ -527,7 +527,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@insert_into2
 PREHOOK: Input: default@insert_into2@ds=1
 PREHOOK: Input: default@insert_into2@ds=2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM insert_into2
 ) t
@@ -535,7 +535,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into2
 POSTHOOK: Input: default@insert_into2@ds=1
 POSTHOOK: Input: default@insert_into2@ds=2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 -33609711132
 PREHOOK: query: explain
 SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
@@ -556,11 +556,11 @@ STAGE PLANS:
 PREHOOK: query: SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@insert_into2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 50
 PREHOOK: query: insert into table insert_into2 partition (ds='2') values(1, 
'abc')
 PREHOOK: type: QUERY
@@ -634,12 +634,12 @@ PREHOOK: query: select count(*) from insert_into2 where 
ds='2'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@insert_into2
 PREHOOK: Input: default@insert_into2@ds=2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from insert_into2 where ds='2'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into2
 POSTHOOK: Input: default@insert_into2@ds=2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 51
 PREHOOK: query: DROP TABLE insert_into2
 PREHOOK: type: DROPTABLE

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/intersect_all.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/intersect_all.q.out 
b/ql/src/test/results/clientpositive/llap/intersect_all.q.out
index ed80e0d..20a234e 100644
--- a/ql/src/test/results/clientpositive/llap/intersect_all.q.out
+++ b/ql/src/test/results/clientpositive/llap/intersect_all.q.out
@@ -37,11 +37,11 @@ POSTHOOK: Lineage: b.value SCRIPT []
 PREHOOK: query: select key, value, count(1) as c from a group by key, value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@a
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select key, value, count(1) as c from a group by key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@a
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 2      3       1
 1      2       2
 1      3       1
@@ -49,60 +49,60 @@ PREHOOK: query: select * from a intersect all select * from 
b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@a
 PREHOOK: Input: default@b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from a intersect all select * from b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@a
 POSTHOOK: Input: default@b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 2      3
 1      2
 PREHOOK: query: select * from b intersect all select * from a intersect all 
select * from b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@a
 PREHOOK: Input: default@b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from b intersect all select * from a intersect all 
select * from b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@a
 POSTHOOK: Input: default@b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 2      3
 1      2
 PREHOOK: query: select * from a intersect all select * from b union all select 
* from a intersect all select * from b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@a
 PREHOOK: Input: default@b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from a intersect all select * from b union all 
select * from a intersect all select * from b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@a
 POSTHOOK: Input: default@b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 2      3
 1      2
 PREHOOK: query: select * from a intersect all select * from b union select * 
from a intersect all select * from b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@a
 PREHOOK: Input: default@b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from a intersect all select * from b union select * 
from a intersect all select * from b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@a
 POSTHOOK: Input: default@b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 2      3
 1      2
 PREHOOK: query: select * from a intersect all select * from b intersect all 
select * from a intersect all select * from b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@a
 PREHOOK: Input: default@b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from a intersect all select * from b intersect all 
select * from a intersect all select * from b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@a
 POSTHOOK: Input: default@b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 2      3
 1      2
 PREHOOK: query: select * from (select a.key, b.value from a join b on 
a.key=b.key)sub1 
@@ -111,14 +111,14 @@ select * from (select a.key, b.value from a join b on 
a.key=b.key)sub2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@a
 PREHOOK: Input: default@b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from (select a.key, b.value from a join b on 
a.key=b.key)sub1 
 intersect all 
 select * from (select a.key, b.value from a join b on a.key=b.key)sub2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@a
 POSTHOOK: Input: default@b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 2      3
 1      2
 1      2
@@ -129,14 +129,14 @@ select * from (select b.value as key, a.key as value from 
a join b on a.key=b.ke
 PREHOOK: type: QUERY
 PREHOOK: Input: default@a
 PREHOOK: Input: default@b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from (select a.key, b.value from a join b on 
a.key=b.key)sub1
 intersect all
 select * from (select b.value as key, a.key as value from a join b on 
a.key=b.key)sub2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@a
 POSTHOOK: Input: default@b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain select * from src intersect all select * from src
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from src intersect all select * from src
@@ -285,11 +285,11 @@ STAGE PLANS:
 PREHOOK: query: select * from src intersect all select * from src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from src intersect all select * from src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0      val_0
 0      val_0
 0      val_0
@@ -1028,11 +1028,11 @@ STAGE PLANS:
 PREHOOK: query: select * from src intersect all select * from src intersect 
all select * from src intersect all select * from src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from src intersect all select * from src intersect 
all select * from src intersect all select * from src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0      val_0
 0      val_0
 0      val_0
@@ -1688,10 +1688,10 @@ PREHOOK: query: select value from a group by value 
intersect all select key from
 PREHOOK: type: QUERY
 PREHOOK: Input: default@a
 PREHOOK: Input: default@b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select value from a group by value intersect all select key 
from b group by key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@a
 POSTHOOK: Input: default@b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 2

Reply via email to