You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by kg...@apache.org on 2018/01/22 08:01:07 UTC

[04/17] hive git commit: HIVE-18061: q.outs: be more selective with masking hdfs paths (Laszlo Bodor via Zoltan Haindrich)

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/spark/vector_outer_join5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/vector_outer_join5.q.out b/ql/src/test/results/clientpositive/spark/vector_outer_join5.q.out
index 680ee42..baf7204 100644
--- a/ql/src/test/results/clientpositive/spark/vector_outer_join5.q.out
+++ b/ql/src/test/results/clientpositive/spark/vector_outer_join5.q.out
@@ -28,12 +28,12 @@ PREHOOK: query: ANALYZE TABLE sorted_mod_4 COMPUTE STATISTICS FOR COLUMNS
 PREHOOK: type: QUERY
 PREHOOK: Input: default@sorted_mod_4
 PREHOOK: Output: default@sorted_mod_4
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: ANALYZE TABLE sorted_mod_4 COMPUTE STATISTICS FOR COLUMNS
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@sorted_mod_4
 POSTHOOK: Output: default@sorted_mod_4
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: create table small_table stored
 as orc as select ctinyint, cbigint from alltypesorc limit 100
 PREHOOK: type: CREATETABLE_AS_SELECT
@@ -60,12 +60,12 @@ PREHOOK: query: ANALYZE TABLE small_table COMPUTE STATISTICS FOR COLUMNS
 PREHOOK: type: QUERY
 PREHOOK: Input: default@small_table
 PREHOOK: Output: default@small_table
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: ANALYZE TABLE small_table COMPUTE STATISTICS FOR COLUMNS
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@small_table
 POSTHOOK: Output: default@small_table
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain vectorization detail formatted
 select count(*) from (select s.*, st.*
 from sorted_mod_4 s
@@ -89,7 +89,7 @@ on s.ctinyint = st.ctinyint
 PREHOOK: type: QUERY
 PREHOOK: Input: default@small_table
 PREHOOK: Input: default@sorted_mod_4
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from (select s.*, st.*
 from sorted_mod_4 s
 left outer join small_table st
@@ -98,7 +98,7 @@ on s.ctinyint = st.ctinyint
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@small_table
 POSTHOOK: Input: default@sorted_mod_4
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 6876
 PREHOOK: query: explain vectorization detail formatted
 select count(*) from (select s.ctinyint, s.cmodint, sm.cbigint 
@@ -123,7 +123,7 @@ on s.ctinyint = sm.ctinyint and s.cmodint = 2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@small_table
 PREHOOK: Input: default@sorted_mod_4
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from (select s.ctinyint, s.cmodint, sm.cbigint 
 from sorted_mod_4 s
 left outer join small_table sm
@@ -132,7 +132,7 @@ on s.ctinyint = sm.ctinyint and s.cmodint = 2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@small_table
 POSTHOOK: Input: default@sorted_mod_4
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 6058
 PREHOOK: query: explain vectorization detail formatted
 select count(*) from (select s.ctinyint, s.cmodint, sm.cbigint 
@@ -157,7 +157,7 @@ on s.ctinyint = sm.ctinyint and pmod(s.ctinyint, 4) = s.cmodint
 PREHOOK: type: QUERY
 PREHOOK: Input: default@small_table
 PREHOOK: Input: default@sorted_mod_4
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from (select s.ctinyint, s.cmodint, sm.cbigint 
 from sorted_mod_4 s
 left outer join small_table sm
@@ -166,7 +166,7 @@ on s.ctinyint = sm.ctinyint and pmod(s.ctinyint, 4) = s.cmodint
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@small_table
 POSTHOOK: Input: default@sorted_mod_4
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 6248
 PREHOOK: query: explain vectorization detail formatted
 select count(*) from (select s.ctinyint, s.cmodint, sm.cbigint 
@@ -191,7 +191,7 @@ on s.ctinyint = sm.ctinyint and s.ctinyint < 100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@small_table
 PREHOOK: Input: default@sorted_mod_4
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from (select s.ctinyint, s.cmodint, sm.cbigint 
 from sorted_mod_4 s
 left outer join small_table sm
@@ -200,7 +200,7 @@ on s.ctinyint = sm.ctinyint and s.ctinyint < 100
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@small_table
 POSTHOOK: Input: default@sorted_mod_4
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 6876
 PREHOOK: query: explain vectorization detail formatted
 select count(*) from (select s.*, sm.*, s2.* 
@@ -231,7 +231,7 @@ left outer join sorted_mod_4 s2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@small_table
 PREHOOK: Input: default@sorted_mod_4
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from (select s.*, sm.*, s2.* 
 from sorted_mod_4 s
 left outer join small_table sm
@@ -242,7 +242,7 @@ left outer join sorted_mod_4 s2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@small_table
 POSTHOOK: Input: default@sorted_mod_4
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 3268334
 PREHOOK: query: create table mod_8_mod_4 stored as orc
 as select pmod(ctinyint, 8) as cmodtinyint, pmod(cint, 4) as cmodint from alltypesorc
@@ -272,12 +272,12 @@ PREHOOK: query: ANALYZE TABLE mod_8_mod_4 COMPUTE STATISTICS FOR COLUMNS
 PREHOOK: type: QUERY
 PREHOOK: Input: default@mod_8_mod_4
 PREHOOK: Output: default@mod_8_mod_4
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: ANALYZE TABLE mod_8_mod_4 COMPUTE STATISTICS FOR COLUMNS
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@mod_8_mod_4
 POSTHOOK: Output: default@mod_8_mod_4
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: create table small_table2 stored
 as orc as select pmod(ctinyint, 16) as cmodtinyint, cbigint from alltypesorc limit 100
 PREHOOK: type: CREATETABLE_AS_SELECT
@@ -304,12 +304,12 @@ PREHOOK: query: ANALYZE TABLE small_table2 COMPUTE STATISTICS FOR COLUMNS
 PREHOOK: type: QUERY
 PREHOOK: Input: default@small_table2
 PREHOOK: Output: default@small_table2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: ANALYZE TABLE small_table2 COMPUTE STATISTICS FOR COLUMNS
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@small_table2
 POSTHOOK: Output: default@small_table2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain vectorization detail formatted
 select count(*) from (select s.*, st.*
 from mod_8_mod_4 s
@@ -333,7 +333,7 @@ on s.cmodtinyint = st.cmodtinyint
 PREHOOK: type: QUERY
 PREHOOK: Input: default@mod_8_mod_4
 PREHOOK: Input: default@small_table2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from (select s.*, st.*
 from mod_8_mod_4 s
 left outer join small_table2 st
@@ -342,7 +342,7 @@ on s.cmodtinyint = st.cmodtinyint
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@mod_8_mod_4
 POSTHOOK: Input: default@small_table2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 39112
 PREHOOK: query: explain vectorization detail formatted
 select count(*) from (select s.cmodtinyint, s.cmodint, sm.cbigint 
@@ -367,7 +367,7 @@ on s.cmodtinyint = sm.cmodtinyint and s.cmodint = 2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@mod_8_mod_4
 PREHOOK: Input: default@small_table2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from (select s.cmodtinyint, s.cmodint, sm.cbigint 
 from mod_8_mod_4 s
 left outer join small_table2 sm
@@ -376,7 +376,7 @@ on s.cmodtinyint = sm.cmodtinyint and s.cmodint = 2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@mod_8_mod_4
 POSTHOOK: Input: default@small_table2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 11171
 PREHOOK: query: explain vectorization detail formatted
 select count(*) from (select s.cmodtinyint, s.cmodint, sm.cbigint 
@@ -401,7 +401,7 @@ on s.cmodtinyint = sm.cmodtinyint and pmod(s.cmodtinyint, 4) = s.cmodint
 PREHOOK: type: QUERY
 PREHOOK: Input: default@mod_8_mod_4
 PREHOOK: Input: default@small_table2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from (select s.cmodtinyint, s.cmodint, sm.cbigint 
 from mod_8_mod_4 s
 left outer join small_table2 sm
@@ -410,7 +410,7 @@ on s.cmodtinyint = sm.cmodtinyint and pmod(s.cmodtinyint, 4) = s.cmodint
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@mod_8_mod_4
 POSTHOOK: Input: default@small_table2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 14371
 PREHOOK: query: explain vectorization detail formatted
 select count(*) from (select s.cmodtinyint, s.cmodint, sm.cbigint 
@@ -435,7 +435,7 @@ on s.cmodtinyint = sm.cmodtinyint and s.cmodtinyint < 3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@mod_8_mod_4
 PREHOOK: Input: default@small_table2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from (select s.cmodtinyint, s.cmodint, sm.cbigint 
 from mod_8_mod_4 s
 left outer join small_table2 sm
@@ -444,7 +444,7 @@ on s.cmodtinyint = sm.cmodtinyint and s.cmodtinyint < 3
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@mod_8_mod_4
 POSTHOOK: Input: default@small_table2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 17792
 PREHOOK: query: explain vectorization detail formatted
 select count(*) from (select s.*, sm.*, s2.* 
@@ -475,7 +475,7 @@ left outer join mod_8_mod_4 s2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@mod_8_mod_4
 PREHOOK: Input: default@small_table2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from (select s.*, sm.*, s2.* 
 from mod_8_mod_4 s
 left outer join small_table2 sm
@@ -486,5 +486,5 @@ left outer join mod_8_mod_4 s2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@mod_8_mod_4
 POSTHOOK: Input: default@small_table2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 6524438

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/tez/acid_vectorization_original_tez.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/acid_vectorization_original_tez.q.out b/ql/src/test/results/clientpositive/tez/acid_vectorization_original_tez.q.out
index 2593fb1..50c53d0 100644
--- a/ql/src/test/results/clientpositive/tez/acid_vectorization_original_tez.q.out
+++ b/ql/src/test/results/clientpositive/tez/acid_vectorization_original_tez.q.out
@@ -92,11 +92,11 @@ POSTHOOK: Output: default@over10k_orc_bucketed
 PREHOOK: query: select distinct si, si%4 from over10k order by si
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over10k
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select distinct si, si%4 from over10k order by si
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over10k
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 NULL	NULL
 256	0
 257	1
@@ -370,7 +370,10 @@ POSTHOOK: Lineage: over10k_orc_bucketed.si SIMPLE [(over10k)over10k.FieldSchema(
 POSTHOOK: Lineage: over10k_orc_bucketed.t SIMPLE [(over10k)over10k.FieldSchema(name:t, type:tinyint, comment:null), ]
 POSTHOOK: Lineage: over10k_orc_bucketed.ts SIMPLE [(over10k)over10k.FieldSchema(name:ts, type:timestamp, comment:null), ]
 Found 4 items
-#### A masked pattern was here ####
+-rw-rw-rw-   3 ### USER ### ### GROUP ###       7838 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-rw-rw-   3 ### USER ### ### GROUP ###       7786 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-rw-rw-   3 ### USER ### ### GROUP ###       7419 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-rw-rw-   3 ### USER ### ### GROUP ###       8035 ### HDFS DATE ### hdfs://### HDFS PATH ###
 PREHOOK: query: insert into over10k_orc_bucketed select * from over10k
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over10k
@@ -391,15 +394,30 @@ POSTHOOK: Lineage: over10k_orc_bucketed.si SIMPLE [(over10k)over10k.FieldSchema(
 POSTHOOK: Lineage: over10k_orc_bucketed.t SIMPLE [(over10k)over10k.FieldSchema(name:t, type:tinyint, comment:null), ]
 POSTHOOK: Lineage: over10k_orc_bucketed.ts SIMPLE [(over10k)over10k.FieldSchema(name:ts, type:timestamp, comment:null), ]
 Found 8 items
-#### A masked pattern was here ####
+-rw-rw-rw-   3 ### USER ### ### GROUP ###       7838 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-rw-rw-   3 ### USER ### ### GROUP ###       7838 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-rw-rw-   3 ### USER ### ### GROUP ###       7786 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-rw-rw-   3 ### USER ### ### GROUP ###       7786 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-rw-rw-   3 ### USER ### ### GROUP ###       7419 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-rw-rw-   3 ### USER ### ### GROUP ###       7419 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-rw-rw-   3 ### USER ### ### GROUP ###       8035 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-rw-rw-   3 ### USER ### ### GROUP ###       8035 ### HDFS DATE ### hdfs://### HDFS PATH ###
 PREHOOK: query: select distinct 7 as seven, INPUT__FILE__NAME from over10k_orc_bucketed
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select distinct 7 as seven, INPUT__FILE__NAME from over10k_orc_bucketed
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
+7	hdfs://### HDFS PATH ###
+7	hdfs://### HDFS PATH ###
+7	hdfs://### HDFS PATH ###
+7	hdfs://### HDFS PATH ###
+7	hdfs://### HDFS PATH ###
+7	hdfs://### HDFS PATH ###
+7	hdfs://### HDFS PATH ###
+7	hdfs://### HDFS PATH ###
 PREHOOK: query: alter table over10k_orc_bucketed set TBLPROPERTIES ('transactional'='true')
 PREHOOK: type: ALTERTABLE_PROPERTIES
 PREHOOK: Input: default@over10k_orc_bucketed
@@ -466,11 +484,11 @@ STAGE PLANS:
 PREHOOK: query: select t, si, i from over10k_orc_bucketed where b = 4294967363 and t < 100 order by  t, si, i
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select t, si, i from over10k_orc_bucketed where b = 4294967363 and t < 100 order by  t, si, i
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 -3	344	65733
 -3	344	65733
 5	501	65585
@@ -536,11 +554,11 @@ STAGE PLANS:
 PREHOOK: query: select ROW__ID, t, si, i from over10k_orc_bucketed where b = 4294967363 and t < 100 order by ROW__ID
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select ROW__ID, t, si, i from over10k_orc_bucketed where b = 4294967363 and t < 100 order by ROW__ID
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 {"transactionid":0,"bucketid":536870912,"rowid":36}	-3	344	65733
 {"transactionid":0,"bucketid":536870912,"rowid":300}	-3	344	65733
 {"transactionid":0,"bucketid":536936448,"rowid":82}	5	501	65585
@@ -631,11 +649,11 @@ POSTHOOK: Output: default@over10k_orc_bucketed
 PREHOOK: query: select ROW__ID, t, si, i from over10k_orc_bucketed where b = 4294967363 and t < 100 order by ROW__ID
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select ROW__ID, t, si, i from over10k_orc_bucketed where b = 4294967363 and t < 100 order by ROW__ID
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 {"transactionid":### Masked txnid ###,"bucketid":536870912,"rowid":0}	-3	344	0
 {"transactionid":### Masked txnid ###,"bucketid":536870912,"rowid":1}	-3	344	0
 {"transactionid":### Masked txnid ###,"bucketid":536936448,"rowid":0}	5	501	0
@@ -707,11 +725,11 @@ STAGE PLANS:
 PREHOOK: query: select ROW__ID, count(*) from over10k_orc_bucketed group by ROW__ID having count(*) > 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select ROW__ID, count(*) from over10k_orc_bucketed group by ROW__ID having count(*) > 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: alter table over10k_orc_bucketed compact 'major' WITH OVERWRITE TBLPROPERTIES ('compactor.mapreduce.map.memory.mb'='500', 'compactor.mapreduce.reduce.memory.mb'='500','compactor.mapreduce.map.memory.mb'='500', 'compactor.hive.tez.container.size'='500')
 PREHOOK: type: ALTERTABLE_COMPACT
 POSTHOOK: query: alter table over10k_orc_bucketed compact 'major' WITH OVERWRITE TBLPROPERTIES ('compactor.mapreduce.map.memory.mb'='500', 'compactor.mapreduce.reduce.memory.mb'='500','compactor.mapreduce.map.memory.mb'='500', 'compactor.hive.tez.container.size'='500')
@@ -719,11 +737,11 @@ POSTHOOK: type: ALTERTABLE_COMPACT
 PREHOOK: query: select ROW__ID, t, si, i from over10k_orc_bucketed where b = 4294967363 and t < 100 order by ROW__ID
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select ROW__ID, t, si, i from over10k_orc_bucketed where b = 4294967363 and t < 100 order by ROW__ID
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 {"transactionid":### Masked txnid ###,"bucketid":536870912,"rowid":0}	-3	344	0
 {"transactionid":### Masked txnid ###,"bucketid":536870912,"rowid":1}	-3	344	0
 {"transactionid":### Masked txnid ###,"bucketid":536936448,"rowid":0}	5	501	0
@@ -733,8 +751,8 @@ POSTHOOK: Input: default@over10k_orc_bucketed
 PREHOOK: query: select ROW__ID, count(*) from over10k_orc_bucketed group by ROW__ID having count(*) > 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select ROW__ID, count(*) from over10k_orc_bucketed group by ROW__ID having count(*) > 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/tez/delete_orig_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/delete_orig_table.q.out b/ql/src/test/results/clientpositive/tez/delete_orig_table.q.out
index a036b06..d731cb1 100644
--- a/ql/src/test/results/clientpositive/tez/delete_orig_table.q.out
+++ b/ql/src/test/results/clientpositive/tez/delete_orig_table.q.out
@@ -12,7 +12,7 @@ PREHOOK: query: create table acid_dot(
     cboolean1 BOOLEAN,
 #### 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@acid_dot
 POSTHOOK: query: create table acid_dot(
@@ -29,17 +29,17 @@ POSTHOOK: query: create table acid_dot(
     cboolean1 BOOLEAN,
 #### 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@acid_dot
 PREHOOK: query: select count(*) from acid_dot
 PREHOOK: type: QUERY
 PREHOOK: Input: default@acid_dot
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from acid_dot
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_dot
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 12288
 PREHOOK: query: delete from acid_dot where cint < -1070551679
 PREHOOK: type: QUERY
@@ -52,10 +52,10 @@ POSTHOOK: Output: default@acid_dot
 PREHOOK: query: select count(*) from acid_dot
 PREHOOK: type: QUERY
 PREHOOK: Input: default@acid_dot
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from acid_dot
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_dot
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 12280
 #### A masked pattern was here ####

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/tez/explainanalyze_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/explainanalyze_1.q.out b/ql/src/test/results/clientpositive/tez/explainanalyze_1.q.out
index 8e735f9..5cbd032 100644
--- a/ql/src/test/results/clientpositive/tez/explainanalyze_1.q.out
+++ b/ql/src/test/results/clientpositive/tez/explainanalyze_1.q.out
@@ -1,11 +1,11 @@
 PREHOOK: query: select * from src a union all select * from src b limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from src a union all select * from src b limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain analyze select * from src a union all select * from src b limit 10
 PREHOOK: type: QUERY
 POSTHOOK: query: explain analyze select * from src a union all select * from src b limit 10
@@ -41,11 +41,11 @@ Stage-0
 PREHOOK: query: select key from src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select key from src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain analyze select key from src
 PREHOOK: type: QUERY
 POSTHOOK: query: explain analyze select key from src
@@ -150,11 +150,11 @@ Stage-3
 PREHOOK: query: select key from src limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select key from src limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain analyze select key from src limit 10
 PREHOOK: type: QUERY
 POSTHOOK: query: explain analyze select key from src limit 10
@@ -174,11 +174,11 @@ Stage-0
 PREHOOK: query: select key from src where value < 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select key from src where value < 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain analyze select key from src where value < 10
 PREHOOK: type: QUERY
 POSTHOOK: query: explain analyze select key from src where value < 10
@@ -198,11 +198,11 @@ Stage-0
 PREHOOK: query: select key from src where key < 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select key from src where key < 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain analyze select key from src where key < 10
 PREHOOK: type: QUERY
 POSTHOOK: query: explain analyze select key from src where key < 10
@@ -222,20 +222,20 @@ Stage-0
 PREHOOK: query: select count(*) from (select key from src where key < 10)subq
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from (select key from src where key < 10)subq
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 10
 PREHOOK: query: select key, count(key) from src group by key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select key, count(key) from src group by key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain analyze select key, count(key) from src group by key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain analyze select key, count(key) from src group by key
@@ -264,20 +264,20 @@ Stage-0
 PREHOOK: query: select count(*) from (select key, count(key) from src group by key)subq
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from (select key, count(key) from src group by key)subq
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 309
 PREHOOK: query: select count(*) from src a join src b on a.key = b.value where a.key > 0
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from src a join src b on a.key = b.value where a.key > 0
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain analyze select count(*) from src a join src b on a.key = b.value where a.key > 0
 PREHOOK: type: QUERY
 POSTHOOK: query: explain analyze select count(*) from src a join src b on a.key = b.value where a.key > 0
@@ -322,11 +322,11 @@ Stage-0
 PREHOOK: query: select count(*) from src a join src b on a.key = b.key where a.key > 0
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from src a join src b on a.key = b.key where a.key > 0
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain analyze select count(*) from src a join src b on a.key = b.key where a.key > 0
 PREHOOK: type: QUERY
 POSTHOOK: query: explain analyze select count(*) from src a join src b on a.key = b.key where a.key > 0
@@ -371,20 +371,20 @@ Stage-0
 PREHOOK: query: select count(*) from src a join src b on a.key = b.key where a.key > 0
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from src a join src b on a.key = b.key where a.key > 0
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1019
 PREHOOK: query: select * from src a union all select * from src b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from src a union all select * from src b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain analyze select * from src a union all select * from src b
 PREHOOK: type: QUERY
 POSTHOOK: query: explain analyze select * from src a union all select * from src b
@@ -416,22 +416,22 @@ Stage-0
 PREHOOK: query: select count(*) from (select * from src a union all select * from src b)subq
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from (select * from src a union all select * from src b)subq
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1000
 PREHOOK: query: SELECT x.key, y.value
 FROM src x JOIN src y ON (x.key = y.key)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT x.key, y.value
 FROM src x JOIN src y ON (x.key = y.key)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: EXPLAIN analyze 
 SELECT x.key, y.value
 FROM src x JOIN src y ON (x.key = y.key)
@@ -481,7 +481,7 @@ on a.key = b.key
 PREHOOK: type: QUERY
 PREHOOK: Input: cat
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT
 TRANSFORM(a.key, a.value) USING 'cat' AS (tkey, tvalue)
 FROM src a join src b
@@ -489,7 +489,7 @@ on a.key = b.key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: cat
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain analyze
 SELECT
 TRANSFORM(a.key, a.value) USING 'cat' AS (tkey, tvalue)

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/tez/explainanalyze_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/explainanalyze_3.q.out b/ql/src/test/results/clientpositive/tez/explainanalyze_3.q.out
index 05fcbc3..444ff12 100644
--- a/ql/src/test/results/clientpositive/tez/explainanalyze_3.q.out
+++ b/ql/src/test/results/clientpositive/tez/explainanalyze_3.q.out
@@ -6,7 +6,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 key, value
 FROM srcpart LATERAL VIEW explode(array(1,2,3)) myTable AS myCol
 POSTHOOK: type: QUERY
@@ -15,7 +15,7 @@ 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 ###
 PREHOOK: query: explain analyze select key, value
 FROM srcpart LATERAL VIEW explode(array(1,2,3)) myTable AS myCol
 PREHOOK: type: QUERY
@@ -66,9 +66,11 @@ Stage-1
 #### A masked pattern was here ####
 PREHOOK: type: CREATEDATABASE
 PREHOOK: Output: database:newDB
+PREHOOK: Output: hdfs://### HDFS PATH ###
 #### A masked pattern was here ####
 POSTHOOK: type: CREATEDATABASE
 POSTHOOK: Output: database:newDB
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 #### A masked pattern was here ####
 PREHOOK: type: CREATEDATABASE
 #### A masked pattern was here ####
@@ -78,10 +80,11 @@ Stage-0
 #### A masked pattern was here ####
 PREHOOK: type: CREATEDATABASE
 PREHOOK: Output: database:newDB
+PREHOOK: Output: hdfs://### HDFS PATH ###
 #### A masked pattern was here ####
 POSTHOOK: type: CREATEDATABASE
 POSTHOOK: Output: database:newDB
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: describe database extended newDB
 PREHOOK: type: DESCDATABASE
 PREHOOK: Input: database:newdb
@@ -235,12 +238,12 @@ PREHOOK: query: analyze table src_stats compute statistics for columns
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_stats
 PREHOOK: Output: default@src_stats
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: analyze table src_stats compute statistics for columns
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_stats
 POSTHOOK: Output: default@src_stats
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain analyze analyze table src_stats compute statistics for columns
 PREHOOK: type: QUERY
 POSTHOOK: query: explain analyze analyze table src_stats compute statistics for columns
@@ -285,11 +288,11 @@ POSTHOOK: Output: database:default
 PREHOOK: query: SELECT SIGMOID(2) FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT SIGMOID(2) FROM src LIMIT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain analyze SELECT SIGMOID(2) FROM src LIMIT 1
 PREHOOK: type: QUERY
 POSTHOOK: query: explain analyze SELECT SIGMOID(2) FROM src LIMIT 1
@@ -417,11 +420,11 @@ Stage-1
 PREHOOK: query: select key from src_autho_test order by key limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_autho_test
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select key from src_autho_test order by key limit 20
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_autho_test
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0
 0
 0
@@ -586,12 +589,12 @@ PREHOOK: query: with cte as (select * from src  order by key limit 5)
 select * from cte
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: with cte as (select * from src  order by key limit 5)
 select * from cte
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain analyze with cte as (select * from src  order by key limit 5)
 select * from cte
 PREHOOK: type: QUERY
@@ -816,7 +819,7 @@ PREHOOK: Input: default@tab
 PREHOOK: Input: default@tab@ds=2008-04-08
 PREHOOK: Input: default@tab_part
 PREHOOK: Input: default@tab_part@ds=2008-04-08
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select a.key, a.value, b.value
 from tab a join tab_part b on a.key = b.key
 POSTHOOK: type: QUERY
@@ -824,7 +827,7 @@ POSTHOOK: Input: default@tab
 POSTHOOK: Input: default@tab@ds=2008-04-08
 POSTHOOK: Input: default@tab_part
 POSTHOOK: Input: default@tab_part@ds=2008-04-08
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain analyze
 select a.key, a.value, b.value
 from tab a join tab_part b on a.key = b.key

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/tez/explainanalyze_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/explainanalyze_4.q.out b/ql/src/test/results/clientpositive/tez/explainanalyze_4.q.out
index 9c678ac..fd2e95d 100644
--- a/ql/src/test/results/clientpositive/tez/explainanalyze_4.q.out
+++ b/ql/src/test/results/clientpositive/tez/explainanalyze_4.q.out
@@ -6,7 +6,7 @@ where
 order by a.cint
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select
   *
 from alltypesorc a join alltypesorc b on a.cint = b.cint
@@ -15,7 +15,7 @@ where
 order by a.cint
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain analyze
 select
   *
@@ -77,7 +77,7 @@ where
 order by a.cint
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select
   *
 from alltypesorc a join alltypesorc b on a.cint = b.cint
@@ -86,7 +86,7 @@ where
 order by a.cint
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 11	NULL	1000828	1531084669	11.0	NULL	wM316f6NqGIkoP388j3F6	poWQQo3Upvt3Wh	1969-12-31 16:00:02.351	NULL	false	true	11	NULL	1000828	1531084669	11.0	NULL	wM316f6NqGIkoP388j3F6	poWQQo3Upvt3Wh	1969-12-31 16:00:02.351	NULL	false	true
 NULL	-3799	1248059	1864027286	NULL	-3799.0	Uhps6mMh3IfHB3j7yH62K	4KWs6gw7lv2WYd66P	NULL	1969-12-31 15:59:54.622	false	true	NULL	-3799	1248059	1864027286	NULL	-3799.0	Uhps6mMh3IfHB3j7yH62K	4KWs6gw7lv2WYd66P	NULL	1969-12-31 15:59:54.622	false	true
 NULL	10782	1286921	1864027286	NULL	10782.0	ODLrXI8882q8LS8	4KWs6gw7lv2WYd66P	NULL	1969-12-31 15:59:52.138	true	true	NULL	10782	1286921	1864027286	NULL	10782.0	ODLrXI8882q8LS8	4KWs6gw7lv2WYd66P	NULL	1969-12-31 15:59:52.138	true	true
@@ -104,7 +104,7 @@ where
   a.cint between 1000000 and 3000000 and b.cbigint is not null
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select
   count(*)
 from alltypesorc a join alltypesorc b on a.cint = b.cint
@@ -112,7 +112,7 @@ where
   a.cint between 1000000 and 3000000 and b.cbigint is not null
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain analyze
 select
   count(*)
@@ -171,7 +171,7 @@ where
   a.cint between 1000000 and 3000000 and b.cbigint is not null
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select
   count(*)
 from alltypesorc a join alltypesorc b on a.cint = b.cint
@@ -179,7 +179,7 @@ where
   a.cint between 1000000 and 3000000 and b.cbigint is not null
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 10
 PREHOOK: query: select
   a.csmallint, count(*) c1
@@ -190,7 +190,7 @@ group by a.csmallint
 order by c1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select
   a.csmallint, count(*) c1
 from alltypesorc a join alltypesorc b on a.cint = b.cint
@@ -200,7 +200,7 @@ group by a.csmallint
 order by c1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain analyze
 select
   a.csmallint, count(*) c1
@@ -271,7 +271,7 @@ group by a.csmallint
 order by c1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select
   a.csmallint, count(*) c1
 from alltypesorc a join alltypesorc b on a.cint = b.cint
@@ -281,7 +281,7 @@ group by a.csmallint
 order by c1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 -13036	1
 -8915	1
 -3799	1
@@ -295,7 +295,7 @@ where
 order by a.cint
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select
   *
 from alltypesorc a join alltypesorc b on a.cint = b.cint
@@ -304,7 +304,7 @@ where
 order by a.cint
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain analyze
 select
   *
@@ -366,7 +366,7 @@ where
 order by a.cint
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select
   *
 from alltypesorc a join alltypesorc b on a.cint = b.cint
@@ -375,7 +375,7 @@ where
 order by a.cint
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 11	NULL	1000828	1531084669	11.0	NULL	wM316f6NqGIkoP388j3F6	poWQQo3Upvt3Wh	1969-12-31 16:00:02.351	NULL	false	true	11	NULL	1000828	1531084669	11.0	NULL	wM316f6NqGIkoP388j3F6	poWQQo3Upvt3Wh	1969-12-31 16:00:02.351	NULL	false	true
 NULL	-3799	1248059	1864027286	NULL	-3799.0	Uhps6mMh3IfHB3j7yH62K	4KWs6gw7lv2WYd66P	NULL	1969-12-31 15:59:54.622	false	true	NULL	-3799	1248059	1864027286	NULL	-3799.0	Uhps6mMh3IfHB3j7yH62K	4KWs6gw7lv2WYd66P	NULL	1969-12-31 15:59:54.622	false	true
 NULL	10782	1286921	1864027286	NULL	10782.0	ODLrXI8882q8LS8	4KWs6gw7lv2WYd66P	NULL	1969-12-31 15:59:52.138	true	true	NULL	10782	1286921	1864027286	NULL	10782.0	ODLrXI8882q8LS8	4KWs6gw7lv2WYd66P	NULL	1969-12-31 15:59:52.138	true	true
@@ -393,7 +393,7 @@ where
   a.cint between 1000000 and 3000000 and b.cbigint is not null
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select
   count(*)
 from alltypesorc a join alltypesorc b on a.cint = b.cint
@@ -401,7 +401,7 @@ where
   a.cint between 1000000 and 3000000 and b.cbigint is not null
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain analyze
 select
   count(*)
@@ -460,7 +460,7 @@ where
   a.cint between 1000000 and 3000000 and b.cbigint is not null
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select
   count(*)
 from alltypesorc a join alltypesorc b on a.cint = b.cint
@@ -468,7 +468,7 @@ where
   a.cint between 1000000 and 3000000 and b.cbigint is not null
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 10
 PREHOOK: query: select
   a.csmallint, count(*) c1
@@ -479,7 +479,7 @@ group by a.csmallint
 order by c1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select
   a.csmallint, count(*) c1
 from alltypesorc a join alltypesorc b on a.cint = b.cint
@@ -489,7 +489,7 @@ group by a.csmallint
 order by c1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain analyze
 select
   a.csmallint, count(*) c1
@@ -560,7 +560,7 @@ group by a.csmallint
 order by c1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select
   a.csmallint, count(*) c1
 from alltypesorc a join alltypesorc b on a.cint = b.cint
@@ -570,7 +570,7 @@ group by a.csmallint
 order by c1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 -13036	1
 -8915	1
 -3799	1

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/tez/explainanalyze_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/explainanalyze_5.q.out b/ql/src/test/results/clientpositive/tez/explainanalyze_5.q.out
index a1a9431..7f18f2b 100644
--- a/ql/src/test/results/clientpositive/tez/explainanalyze_5.q.out
+++ b/ql/src/test/results/clientpositive/tez/explainanalyze_5.q.out
@@ -37,12 +37,12 @@ PREHOOK: query: analyze table src_stats compute statistics for columns
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_stats
 PREHOOK: Output: default@src_stats
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: analyze table src_stats compute statistics for columns
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_stats
 POSTHOOK: Output: default@src_stats
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain analyze analyze table src_stats compute statistics for columns
 PREHOOK: type: QUERY
 POSTHOOK: query: explain analyze analyze table src_stats compute statistics for columns
@@ -162,12 +162,12 @@ PREHOOK: query: select count(*) from (select * from src union select * from src1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Input: default@src1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from (select * from src union select * from src1)subq
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@src1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 319
 PREHOOK: query: insert overwrite table src_multi2 select subq.key, src.value from (select * from src union select * from src1)subq join src on subq.key=src.key
 PREHOOK: type: QUERY
@@ -260,11 +260,11 @@ POSTHOOK: Lineage: acid_uami.vc SCRIPT []
 PREHOOK: query: select * from acid_uami order by de
 PREHOOK: type: QUERY
 PREHOOK: Input: default@acid_uami
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from acid_uami order by de
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_uami
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1	109.23	mary had a little lamb
 10	119.23	and everywhere that mary went
 6553	923.19	its fleece was white as snow
@@ -310,11 +310,11 @@ Stage-3
 PREHOOK: query: select * from acid_uami order by de
 PREHOOK: type: QUERY
 PREHOOK: Input: default@acid_uami
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from acid_uami order by de
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_uami
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1	109.23	mary had a little lamb
 10	119.23	and everywhere that mary went
 6553	923.19	its fleece was white as snow
@@ -330,11 +330,11 @@ POSTHOOK: Output: default@acid_uami
 PREHOOK: query: select * from acid_uami order by de
 PREHOOK: type: QUERY
 PREHOOK: Input: default@acid_uami
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from acid_uami order by de
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_uami
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1	3.14	mary had a little lamb
 10	3.14	and everywhere that mary went
 6553	923.19	its fleece was white as snow
@@ -353,7 +353,7 @@ PREHOOK: query: create table acid_dot(
     cboolean1 BOOLEAN,
 #### 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@acid_dot
 POSTHOOK: query: create table acid_dot(
@@ -370,17 +370,17 @@ POSTHOOK: query: create table acid_dot(
     cboolean1 BOOLEAN,
 #### 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@acid_dot
 PREHOOK: query: select count(*) from acid_dot
 PREHOOK: type: QUERY
 PREHOOK: Input: default@acid_dot
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from acid_dot
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_dot
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 12288
 PREHOOK: query: delete from acid_dot where cint < -1070551679
 PREHOOK: type: QUERY
@@ -423,11 +423,11 @@ Stage-3
 PREHOOK: query: select count(*) from acid_dot
 PREHOOK: type: QUERY
 PREHOOK: Input: default@acid_dot
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from acid_dot
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_dot
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 12288
 PREHOOK: query: delete from acid_dot where cint < -1070551679
 PREHOOK: type: QUERY
@@ -440,9 +440,9 @@ POSTHOOK: Output: default@acid_dot
 PREHOOK: query: select count(*) from acid_dot
 PREHOOK: type: QUERY
 PREHOOK: Input: default@acid_dot
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from acid_dot
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_dot
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 12280

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/explainuser_3.q.out b/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
index 23c81d6..c6cf680 100644
--- a/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
+++ b/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
@@ -20,12 +20,12 @@ PREHOOK: query: analyze table acid_vectorized compute statistics for columns
 PREHOOK: type: QUERY
 PREHOOK: Input: default@acid_vectorized
 PREHOOK: Output: default@acid_vectorized
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: analyze table acid_vectorized compute statistics for columns
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_vectorized
 POSTHOOK: Output: default@acid_vectorized
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain select a, b from acid_vectorized order by a, b
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a, b from acid_vectorized order by a, b
@@ -100,10 +100,11 @@ Stage-0
 #### A masked pattern was here ####
 PREHOOK: type: CREATEDATABASE
 PREHOOK: Output: database:newDB
+PREHOOK: Output: hdfs://### HDFS PATH ###
 #### A masked pattern was here ####
 POSTHOOK: type: CREATEDATABASE
 POSTHOOK: Output: database:newDB
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain describe database extended newDB
 PREHOOK: type: DESCDATABASE
 POSTHOOK: query: explain describe database extended newDB
@@ -329,11 +330,11 @@ Stage-1
 PREHOOK: query: select key from src_autho_test order by key limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_autho_test
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select key from src_autho_test order by key limit 20
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_autho_test
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0
 0
 0

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_1.q.out b/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_1.q.out
index a709920..0081148 100644
--- a/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_1.q.out
+++ b/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_1.q.out
@@ -1,11 +1,11 @@
 PREHOOK: query: SELECT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1
 PREHOOK: query: explain
 select count(*) from
@@ -112,7 +112,7 @@ PREHOOK: query: select count(*) from
  where c.cint < 2000000000) t1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from
 (select c.ctinyint
  from alltypesorc c
@@ -121,7 +121,7 @@ POSTHOOK: query: select count(*) from
  where c.cint < 2000000000) t1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 3152013
 PREHOOK: query: explain
 select count(*) from
@@ -229,7 +229,7 @@ PREHOOK: query: select count(*) from
  where c.cint < 2000000000) t1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from
 (select c.ctinyint
  from alltypesorc c
@@ -238,7 +238,7 @@ POSTHOOK: query: select count(*) from
  where c.cint < 2000000000) t1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 3152013
 PREHOOK: query: explain
 select count(*) from
@@ -342,7 +342,7 @@ PREHOOK: query: select count(*) from
  on cd.cint = c.cint) t1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from
 (select c.ctinyint
  from alltypesorc c
@@ -350,7 +350,7 @@ POSTHOOK: query: select count(*) from
  on cd.cint = c.cint) t1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 3152013
 PREHOOK: query: explain
 select count(*) from
@@ -455,7 +455,7 @@ PREHOOK: query: select count(*) from
  on cd.cint = c.cint) t1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from
 (select c.ctinyint
  from alltypesorc c
@@ -463,7 +463,7 @@ POSTHOOK: query: select count(*) from
  on cd.cint = c.cint) t1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 3152013
 PREHOOK: query: explain
 select count(*) from
@@ -561,7 +561,7 @@ PREHOOK: query: select count(*) from
  on cd.cint = c.cint) t1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from
 (select c.ctinyint
  from alltypesorc c
@@ -569,7 +569,7 @@ POSTHOOK: query: select count(*) from
  on cd.cint = c.cint) t1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 3155128
 PREHOOK: query: explain
 select count(*) from
@@ -668,7 +668,7 @@ PREHOOK: query: select count(*) from
  on cd.cint = c.cint) t1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from
 (select c.ctinyint
  from alltypesorc c
@@ -676,7 +676,7 @@ POSTHOOK: query: select count(*) from
  on cd.cint = c.cint) t1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 3155128
 PREHOOK: query: create table parttbl (key string, value char(20)) partitioned by (dt char(10))
 PREHOOK: type: CREATETABLE
@@ -814,7 +814,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@parttbl
 PREHOOK: Input: default@parttbl@dt=2000-01-01
 PREHOOK: Input: default@parttbl@dt=2000-01-02
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from
 (select p1.value
  from parttbl p1
@@ -824,7 +824,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parttbl
 POSTHOOK: Input: default@parttbl@dt=2000-01-01
 POSTHOOK: Input: default@parttbl@dt=2000-01-02
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1217
 PREHOOK: query: explain
 select count(*) from
@@ -931,7 +931,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@parttbl
 PREHOOK: Input: default@parttbl@dt=2000-01-01
 PREHOOK: Input: default@parttbl@dt=2000-01-02
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from
 (select p1.value
  from parttbl p1
@@ -941,7 +941,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parttbl
 POSTHOOK: Input: default@parttbl@dt=2000-01-01
 POSTHOOK: Input: default@parttbl@dt=2000-01-02
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1217
 PREHOOK: query: explain
 select count(*) from
@@ -1052,7 +1052,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@parttbl
 PREHOOK: Input: default@parttbl@dt=2000-01-01
 PREHOOK: Input: default@parttbl@dt=2000-01-02
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from
 (select p1.value
  from parttbl p1
@@ -1062,7 +1062,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parttbl
 POSTHOOK: Input: default@parttbl@dt=2000-01-01
 POSTHOOK: Input: default@parttbl@dt=2000-01-02
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1217
 PREHOOK: query: explain
 select count(*) from
@@ -1173,7 +1173,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@parttbl
 PREHOOK: Input: default@parttbl@dt=2000-01-01
 PREHOOK: Input: default@parttbl@dt=2000-01-02
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from
 (select p1.value
  from parttbl p1
@@ -1183,7 +1183,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parttbl
 POSTHOOK: Input: default@parttbl@dt=2000-01-01
 POSTHOOK: Input: default@parttbl@dt=2000-01-02
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1217
 PREHOOK: query: drop table parttbl
 PREHOOK: type: DROPTABLE
@@ -1307,14 +1307,14 @@ PREHOOK: query: SELECT l.cint, r.cint, l.cdecimal1, r.cdecimal2
   WHERE l.cint = 6981
 PREHOOK: type: QUERY
 PREHOOK: Input: default@decimal_mapjoin
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT l.cint, r.cint, l.cdecimal1, r.cdecimal2
   FROM decimal_mapjoin l
   JOIN decimal_mapjoin r ON l.cint = r.cint
   WHERE l.cint = 6981
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@decimal_mapjoin
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 6981	6981	NULL	NULL
 6981	6981	NULL	NULL
 6981	6981	NULL	NULL
@@ -1507,14 +1507,14 @@ PREHOOK: query: SELECT l.cint, r.cint, l.cdecimal1, r.cdecimal2
   WHERE l.cint = 6981
 PREHOOK: type: QUERY
 PREHOOK: Input: default@decimal_mapjoin
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT l.cint, r.cint, l.cdecimal1, r.cdecimal2
   FROM decimal_mapjoin l
   JOIN decimal_mapjoin r ON l.cint = r.cint
   WHERE l.cint = 6981
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@decimal_mapjoin
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 6981	6981	NULL	NULL
 6981	6981	NULL	NULL
 6981	6981	NULL	NULL

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_2.q.out b/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_2.q.out
index 0b71be9..cfa60e3 100644
--- a/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_2.q.out
+++ b/ql/src/test/results/clientpositive/tez/hybridgrace_hashjoin_2.q.out
@@ -1,20 +1,20 @@
 PREHOOK: query: SELECT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1
 PREHOOK: query: SELECT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1
 PREHOOK: query: EXPLAIN
 SELECT COUNT(*)
@@ -126,7 +126,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 src1 x JOIN srcpart z ON (x.key = z.key)
 JOIN src y ON (y.key = x.key)
@@ -138,7 +138,7 @@ 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 ###
 428
 PREHOOK: query: EXPLAIN
 SELECT COUNT(*)
@@ -251,7 +251,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 src1 x JOIN srcpart z ON (x.key = z.key)
 JOIN src y ON (y.key = x.key)
@@ -263,16 +263,16 @@ 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 ###
 428
 PREHOOK: query: SELECT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1
 PREHOOK: query: EXPLAIN
 SELECT COUNT(*)
@@ -403,7 +403,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 src1 x JOIN srcpart z ON (x.key = z.key)
 JOIN srcpart w ON (x.key = w.key)
@@ -416,7 +416,7 @@ 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 ###
 5680
 PREHOOK: query: EXPLAIN
 SELECT COUNT(*)
@@ -548,7 +548,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 src1 x JOIN srcpart z ON (x.key = z.key)
 JOIN srcpart w ON (x.key = w.key)
@@ -561,16 +561,16 @@ 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 ###
 5680
 PREHOOK: query: SELECT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1
 PREHOOK: query: EXPLAIN
 SELECT COUNT(*)
@@ -788,7 +788,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 src1 x JOIN srcpart z ON (x.key = z.key)
 JOIN src y ON (y.key = x.key)
@@ -804,7 +804,7 @@ 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 ###
 428
 452
 PREHOOK: query: EXPLAIN
@@ -1025,7 +1025,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 src1 x JOIN srcpart z ON (x.key = z.key)
 JOIN src y ON (y.key = x.key)
@@ -1041,17 +1041,17 @@ 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 ###
 428
 452
 PREHOOK: query: SELECT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1
 PREHOOK: query: EXPLAIN
 SELECT COUNT(*)
@@ -1218,7 +1218,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 src1 x
 JOIN srcpart z1 ON (x.key = z1.key)
@@ -1235,7 +1235,7 @@ 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 ###
 18256
 PREHOOK: query: EXPLAIN
 SELECT COUNT(*)
@@ -1404,7 +1404,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 src1 x
 JOIN srcpart z1 ON (x.key = z1.key)
@@ -1421,5 +1421,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 ###
 18256

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/tez/multi_count_distinct.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/multi_count_distinct.q.out b/ql/src/test/results/clientpositive/tez/multi_count_distinct.q.out
index 49a4c75..bb08f16 100644
--- a/ql/src/test/results/clientpositive/tez/multi_count_distinct.q.out
+++ b/ql/src/test/results/clientpositive/tez/multi_count_distinct.q.out
@@ -60,42 +60,42 @@ Stage-0
 PREHOOK: query: select count(distinct department_id), count(distinct gender), count(distinct education_level) from employee
 PREHOOK: type: QUERY
 PREHOOK: Input: default@employee
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(distinct department_id), count(distinct gender), count(distinct education_level) from employee
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@employee
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 4	2	3
 PREHOOK: query: select count(distinct department_id), count(distinct gender), count(distinct education_level), count(distinct education_level) from employee
 PREHOOK: type: QUERY
 PREHOOK: Input: default@employee
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(distinct department_id), count(distinct gender), count(distinct education_level), count(distinct education_level) from employee
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@employee
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 4	2	3	3
 PREHOOK: query: select count(distinct department_id), count(distinct gender), count(distinct education_level), 
 count(distinct education_level, department_id) from employee
 PREHOOK: type: QUERY
 PREHOOK: Input: default@employee
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(distinct department_id), count(distinct gender), count(distinct education_level), 
 count(distinct education_level, department_id) from employee
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@employee
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 4	2	3	7
 PREHOOK: query: select count(distinct gender), count(distinct department_id), count(distinct gender), count(distinct education_level),
 count(distinct education_level, department_id), count(distinct department_id, education_level) from employee
 PREHOOK: type: QUERY
 PREHOOK: Input: default@employee
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(distinct gender), count(distinct department_id), count(distinct gender), count(distinct education_level),
 count(distinct education_level, department_id), count(distinct department_id, education_level) from employee
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@employee
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 2	4	2	3	7	7
 PREHOOK: query: explain select count(distinct gender), count(distinct department_id), count(distinct gender), count(distinct education_level),
 count(distinct education_level, department_id), count(distinct department_id, education_level), count(distinct department_id, education_level, gender) from employee
@@ -141,12 +141,12 @@ PREHOOK: query: select count(distinct gender), count(distinct department_id), co
 count(distinct education_level, department_id), count(distinct department_id, education_level), count(distinct department_id, education_level, gender) from employee
 PREHOOK: type: QUERY
 PREHOOK: Input: default@employee
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(distinct gender), count(distinct department_id), count(distinct gender), count(distinct education_level),
 count(distinct education_level, department_id), count(distinct department_id, education_level), count(distinct department_id, education_level, gender) from employee
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@employee
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 2	4	2	3	7	7	7
 PREHOOK: query: select count(case i when 3 then 1 else null end) as c0, count(case i when 5 then 1 else null end) as c1, 
 count(case i when 6 then 1 else null end) as c2 from (select grouping__id as i, department_id, gender, 
@@ -154,27 +154,27 @@ education_level from employee group by department_id, gender, education_level gr
 (department_id, gender, education_level))subq
 PREHOOK: type: QUERY
 PREHOOK: Input: default@employee
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(case i when 3 then 1 else null end) as c0, count(case i when 5 then 1 else null end) as c1, 
 count(case i when 6 then 1 else null end) as c2 from (select grouping__id as i, department_id, gender, 
 education_level from employee group by department_id, gender, education_level grouping sets 
 (department_id, gender, education_level))subq
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@employee
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 4	2	3
 PREHOOK: query: select grouping__id as i, department_id, gender, education_level from employee 
 group by department_id, gender, education_level grouping sets 
 (department_id, gender, education_level, (education_level, department_id))
 PREHOOK: type: QUERY
 PREHOOK: Input: default@employee
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select grouping__id as i, department_id, gender, education_level from employee 
 group by department_id, gender, education_level grouping sets 
 (department_id, gender, education_level, (education_level, department_id))
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@employee
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 6	NULL	NULL	1
 6	NULL	NULL	2
 6	NULL	NULL	3

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/tez/orc_merge12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/orc_merge12.q.out b/ql/src/test/results/clientpositive/tez/orc_merge12.q.out
index a999b8a..673bad2 100644
--- a/ql/src/test/results/clientpositive/tez/orc_merge12.q.out
+++ b/ql/src/test/results/clientpositive/tez/orc_merge12.q.out
@@ -97,20 +97,20 @@ POSTHOOK: Output: default@alltypesorc3xcols
 PREHOOK: query: select count(*) from alltypesorc3xcols
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc3xcols
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from alltypesorc3xcols
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc3xcols
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 24576
 PREHOOK: query: select sum(hash(*)) from alltypesorc3xcols
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc3xcols
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select sum(hash(*)) from alltypesorc3xcols
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc3xcols
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 -302946892512
 PREHOOK: query: alter table alltypesorc3xcols concatenate
 PREHOOK: type: ALTER_TABLE_MERGE
@@ -123,27 +123,27 @@ POSTHOOK: Output: default@alltypesorc3xcols
 PREHOOK: query: select count(*) from alltypesorc3xcols
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc3xcols
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from alltypesorc3xcols
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc3xcols
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 24576
 PREHOOK: query: select sum(hash(*)) from alltypesorc3xcols
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc3xcols
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select sum(hash(*)) from alltypesorc3xcols
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc3xcols
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 -302946892512
 PREHOOK: query: select * from alltypesorc3xcols limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc3xcols
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 -- BEGIN ORC FILE DUMP --
-#### A masked pattern was here ####
+Structure for hdfs://### HDFS PATH ###
 File Version: 0.12 with ORC_135
 Rows: 24576
 Compression: ZLIB

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/tez/orc_vectorization_ppd.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/orc_vectorization_ppd.q.out b/ql/src/test/results/clientpositive/tez/orc_vectorization_ppd.q.out
index 35b204b..95bcc7b 100644
--- a/ql/src/test/results/clientpositive/tez/orc_vectorization_ppd.q.out
+++ b/ql/src/test/results/clientpositive/tez/orc_vectorization_ppd.q.out
@@ -161,74 +161,74 @@ POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3,
 PREHOOK: query: select count(*),int(sum(d)) from testorc where s1 is not null
 PREHOOK: type: QUERY
 PREHOOK: Input: default@testorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*),int(sum(d)) from testorc where s1 is not null
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@testorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 3000	1505
 PREHOOK: query: select count(*),int(sum(d)) from testorc where s1 is not null
 PREHOOK: type: QUERY
 PREHOOK: Input: default@testorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*),int(sum(d)) from testorc where s1 is not null
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@testorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 3000	1505
 PREHOOK: query: select count(*),int(sum(d)) from testorc where s2 in ("b", "c", "e", "g")
 PREHOOK: type: QUERY
 PREHOOK: Input: default@testorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*),int(sum(d)) from testorc where s2 in ("b", "c", "e", "g")
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@testorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 4000	2006
 PREHOOK: query: select count(*),int(sum(d)) from testorc where s2 in ("b", "c", "e", "g")
 PREHOOK: type: QUERY
 PREHOOK: Input: default@testorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*),int(sum(d)) from testorc where s2 in ("b", "c", "e", "g")
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@testorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 4000	2006
 PREHOOK: query: select count(*),int(sum(d)) from testorc where s3="z"
 PREHOOK: type: QUERY
 PREHOOK: Input: default@testorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*),int(sum(d)) from testorc where s3="z"
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@testorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 2000	1011
 PREHOOK: query: select count(*),int(sum(d)) from testorc where s3="z"
 PREHOOK: type: QUERY
 PREHOOK: Input: default@testorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*),int(sum(d)) from testorc where s3="z"
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@testorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 2000	1011
 PREHOOK: query: select count(*),int(sum(d)) from testorc where s2="a" or s2="g"
 PREHOOK: type: QUERY
 PREHOOK: Input: default@testorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*),int(sum(d)) from testorc where s2="a" or s2="g"
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@testorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 2000	1006
 PREHOOK: query: select count(*),int(sum(d)) from testorc where s2="a" or s2="g"
 PREHOOK: type: QUERY
 PREHOOK: Input: default@testorc
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*),int(sum(d)) from testorc where s2="a" or s2="g"
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@testorc
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 2000	1006
 PREHOOK: query: drop table srcorc
 PREHOOK: type: DROPTABLE

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/tez/tez-tag.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/tez-tag.q.out b/ql/src/test/results/clientpositive/tez/tez-tag.q.out
index 6071ec4..a006227 100644
--- a/ql/src/test/results/clientpositive/tez/tez-tag.q.out
+++ b/ql/src/test/results/clientpositive/tez/tez-tag.q.out
@@ -161,12 +161,12 @@ PREHOOK: query: analyze table tab2 compute statistics for columns
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tab2
 PREHOOK: Output: default@tab2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: analyze table tab2 compute statistics for columns
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tab2
 POSTHOOK: Output: default@tab2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 PREHOOK: query: explain select count(*) from tab a join tab_part b on a.key = b.key join src1 c on a.value = c.value
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select count(*) from tab a join tab_part b on a.key = b.key join src1 c on a.value = c.value
@@ -232,7 +232,7 @@ PREHOOK: Input: default@tab
 PREHOOK: Input: default@tab@ds=2008-04-08
 PREHOOK: Input: default@tab_part
 PREHOOK: Input: default@tab_part@ds=2008-04-08
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from tab a join tab_part b on a.key = b.key join src1 c on a.value = c.value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src1
@@ -240,7 +240,7 @@ POSTHOOK: Input: default@tab
 POSTHOOK: Input: default@tab@ds=2008-04-08
 POSTHOOK: Input: default@tab_part
 POSTHOOK: Input: default@tab_part@ds=2008-04-08
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 40
 PREHOOK: query: explain select count(*) from (select x.key as key, min(x.value) as value from tab2 x group by x.key) a join (select x.key as key, min(x.value) as value from tab2 x group by x.key) b on a.key = b.key join src1 c on a.value = c.value where c.key < 0
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/tez/tez_union_with_udf.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/tez_union_with_udf.q.out b/ql/src/test/results/clientpositive/tez/tez_union_with_udf.q.out
index 0c8546d..06f638a 100644
--- a/ql/src/test/results/clientpositive/tez/tez_union_with_udf.q.out
+++ b/ql/src/test/results/clientpositive/tez/tez_union_with_udf.q.out
@@ -3,13 +3,13 @@ union all
 select * from (select key + key from src limit 1) b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from (select key + key from src limit 1) a
 union all
 select * from (select key + key from src limit 1) b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 476.0
 476.0
 PREHOOK: query: create temporary function example_add as 'org.apache.hadoop.hive.udf.example.GenericUDFExampleAdd'
@@ -23,12 +23,12 @@ union all
 select example_add(key, key)from (select key from src limit 1) b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select example_add(key, key)from (select key from src limit 1) a
 union all
 select example_add(key, key)from (select key from src limit 1) b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 476.0
 476.0

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/tez/update_orig_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/update_orig_table.q.out b/ql/src/test/results/clientpositive/tez/update_orig_table.q.out
index 5b22fad..d72e8fb 100644
--- a/ql/src/test/results/clientpositive/tez/update_orig_table.q.out
+++ b/ql/src/test/results/clientpositive/tez/update_orig_table.q.out
@@ -12,7 +12,7 @@ PREHOOK: query: create table acid_uot(
     cboolean1 BOOLEAN,
 #### 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@acid_uot
 POSTHOOK: query: create table acid_uot(
@@ -29,7 +29,7 @@ POSTHOOK: query: create table acid_uot(
     cboolean1 BOOLEAN,
 #### 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@acid_uot
 PREHOOK: query: update acid_uot set cstring1 = 'fred' where cint < -1070551679
@@ -43,11 +43,11 @@ POSTHOOK: Output: default@acid_uot
 PREHOOK: query: select * from acid_uot where cstring1 = 'fred'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@acid_uot
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from acid_uot where cstring1 = 'fred'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_uot
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 -51	NULL	-1071480828	-1401575336	-51.0	NULL	fred	4uE7l74tESBiKfu7c8wM7GA	1969-12-31 16:00:08.451	NULL	true	true
 11	NULL	-1072910839	2048385991	11.0	NULL	fred	KbaDXiN85adbHRx58v	1969-12-31 16:00:02.351	NULL	false	false
 11	NULL	-1073279343	-1595604468	11.0	NULL	fred	P76636jJ6qM17d7DIy	1969-12-31 16:00:02.351	NULL	true	true

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/tez/vector_join_part_col_char.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_join_part_col_char.q.out b/ql/src/test/results/clientpositive/tez/vector_join_part_col_char.q.out
index 5c36aeb..b618dc2 100644
--- a/ql/src/test/results/clientpositive/tez/vector_join_part_col_char.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_join_part_col_char.q.out
@@ -143,7 +143,7 @@ PREHOOK: Input: default@char_tbl1@gpa=3.5
 PREHOOK: Input: default@char_tbl2
 PREHOOK: Input: default@char_tbl2@gpa=3    
 PREHOOK: Input: default@char_tbl2@gpa=3.5  
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select c1.name, c1.age, c1.gpa, c2.name, c2.age, c2.gpa from char_tbl1 c1 join char_tbl2 c2 on (c1.gpa = c2.gpa)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@char_tbl1
@@ -152,7 +152,7 @@ POSTHOOK: Input: default@char_tbl1@gpa=3.5
 POSTHOOK: Input: default@char_tbl2
 POSTHOOK: Input: default@char_tbl2@gpa=3    
 POSTHOOK: Input: default@char_tbl2@gpa=3.5  
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 alice underhill	46	3.5                                               	alice underhill	46	3.5  
 PREHOOK: query: select c1.name, c1.age, c1.gpa, c2.name, c2.age, c2.gpa from char_tbl1 c1 join char_tbl2 c2 on (c1.gpa = c2.gpa)
 PREHOOK: type: QUERY
@@ -162,7 +162,7 @@ PREHOOK: Input: default@char_tbl1@gpa=3.5
 PREHOOK: Input: default@char_tbl2
 PREHOOK: Input: default@char_tbl2@gpa=3    
 PREHOOK: Input: default@char_tbl2@gpa=3.5  
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select c1.name, c1.age, c1.gpa, c2.name, c2.age, c2.gpa from char_tbl1 c1 join char_tbl2 c2 on (c1.gpa = c2.gpa)
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@char_tbl1
@@ -171,5 +171,5 @@ POSTHOOK: Input: default@char_tbl1@gpa=3.5
 POSTHOOK: Input: default@char_tbl2
 POSTHOOK: Input: default@char_tbl2@gpa=3    
 POSTHOOK: Input: default@char_tbl2@gpa=3.5  
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 alice underhill	46	3.5                                               	alice underhill	46	3.5