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:15 UTC

[12/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/llap/orc_merge4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_merge4.q.out b/ql/src/test/results/clientpositive/llap/orc_merge4.q.out
index bf3e3a9..16818b4 100644
--- a/ql/src/test/results/clientpositive/llap/orc_merge4.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_merge4.q.out
@@ -37,7 +37,7 @@ POSTHOOK: Output: default@orcfile_merge3a@ds=1
 POSTHOOK: Lineage: orcfile_merge3a PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: orcfile_merge3a PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 Found 1 items
-#### A masked pattern was here ####
+-rw-r--r--   3 ### USER ### ### GROUP ###       2515 ### HDFS DATE ### hdfs://### HDFS PATH ###
 PREHOOK: query: INSERT OVERWRITE TABLE orcfile_merge3a PARTITION (ds='1')
     SELECT * FROM src
 PREHOOK: type: QUERY
@@ -63,9 +63,9 @@ POSTHOOK: Output: default@orcfile_merge3a@ds=2
 POSTHOOK: Lineage: orcfile_merge3a PARTITION(ds=2).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: orcfile_merge3a PARTITION(ds=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 Found 1 items
-#### A masked pattern was here ####
+-rw-r--r--   3 ### USER ### ### GROUP ###       2515 ### HDFS DATE ### hdfs://### HDFS PATH ###
 Found 1 items
-#### A masked pattern was here ####
+-rw-r--r--   3 ### USER ### ### GROUP ###       2515 ### HDFS DATE ### hdfs://### HDFS PATH ###
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE orcfile_merge3b
     SELECT key, value FROM orcfile_merge3a
 PREHOOK: type: QUERY
@@ -179,7 +179,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orcfile_merge3a
 PREHOOK: Input: default@orcfile_merge3a@ds=1
 PREHOOK: Input: default@orcfile_merge3a@ds=2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(key, value) USING 'tr \t _' AS (c)
     FROM orcfile_merge3a
@@ -188,7 +188,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orcfile_merge3a
 POSTHOOK: Input: default@orcfile_merge3a@ds=1
 POSTHOOK: Input: default@orcfile_merge3a@ds=2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 14412220296
 PREHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(key, value) USING 'tr \t _' AS (c)
@@ -196,14 +196,14 @@ PREHOOK: query: SELECT SUM(HASH(c)) FROM (
 ) t
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orcfile_merge3b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(key, value) USING 'tr \t _' AS (c)
     FROM orcfile_merge3b
 ) t
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orcfile_merge3b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 14412220296
 PREHOOK: query: DROP TABLE orcfile_merge3a
 PREHOOK: type: DROPTABLE

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/orc_merge_diff_fs.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_merge_diff_fs.q.out b/ql/src/test/results/clientpositive/llap/orc_merge_diff_fs.q.out
index 64b8460..cdfa1cf 100644
--- a/ql/src/test/results/clientpositive/llap/orc_merge_diff_fs.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_merge_diff_fs.q.out
@@ -509,7 +509,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orcfile_merge1
 PREHOOK: Input: default@orcfile_merge1@ds=1/part=0
 PREHOOK: Input: default@orcfile_merge1@ds=1/part=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 orcfile_merge1 WHERE ds='1'
@@ -518,7 +518,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orcfile_merge1
 POSTHOOK: Input: default@orcfile_merge1@ds=1/part=0
 POSTHOOK: Input: default@orcfile_merge1@ds=1/part=1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 -21975308766
 PREHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(*) USING 'tr \t _' AS (c)
@@ -528,7 +528,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orcfile_merge1b
 PREHOOK: Input: default@orcfile_merge1b@ds=1/part=0
 PREHOOK: Input: default@orcfile_merge1b@ds=1/part=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 orcfile_merge1b WHERE ds='1'
@@ -537,7 +537,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orcfile_merge1b
 POSTHOOK: Input: default@orcfile_merge1b@ds=1/part=0
 POSTHOOK: Input: default@orcfile_merge1b@ds=1/part=1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 -21975308766
 PREHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(*) USING 'tr \t _' AS (c)
@@ -547,7 +547,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@orcfile_merge1c
 PREHOOK: Input: default@orcfile_merge1c@ds=1/part=0
 PREHOOK: Input: default@orcfile_merge1c@ds=1/part=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 orcfile_merge1c WHERE ds='1'
@@ -556,46 +556,46 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orcfile_merge1c
 POSTHOOK: Input: default@orcfile_merge1c@ds=1/part=0
 POSTHOOK: Input: default@orcfile_merge1c@ds=1/part=1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 -21975308766
 PREHOOK: query: select count(*) from orcfile_merge1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orcfile_merge1
 PREHOOK: Input: default@orcfile_merge1@ds=1/part=0
 PREHOOK: Input: default@orcfile_merge1@ds=1/part=1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from orcfile_merge1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orcfile_merge1
 POSTHOOK: Input: default@orcfile_merge1@ds=1/part=0
 POSTHOOK: Input: default@orcfile_merge1@ds=1/part=1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 500
 PREHOOK: query: select count(*) from orcfile_merge1b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orcfile_merge1b
 PREHOOK: Input: default@orcfile_merge1b@ds=1/part=0
 PREHOOK: Input: default@orcfile_merge1b@ds=1/part=1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from orcfile_merge1b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orcfile_merge1b
 POSTHOOK: Input: default@orcfile_merge1b@ds=1/part=0
 POSTHOOK: Input: default@orcfile_merge1b@ds=1/part=1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 500
 PREHOOK: query: select count(*) from orcfile_merge1c
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orcfile_merge1c
 PREHOOK: Input: default@orcfile_merge1c@ds=1/part=0
 PREHOOK: Input: default@orcfile_merge1c@ds=1/part=1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from orcfile_merge1c
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orcfile_merge1c
 POSTHOOK: Input: default@orcfile_merge1c@ds=1/part=0
 POSTHOOK: Input: default@orcfile_merge1c@ds=1/part=1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 500
 PREHOOK: query: DROP TABLE orcfile_merge1
 PREHOOK: type: DROPTABLE

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/orc_ppd_basic.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_ppd_basic.q.out b/ql/src/test/results/clientpositive/llap/orc_ppd_basic.q.out
index 7508dc6..7904661 100644
--- a/ql/src/test/results/clientpositive/llap/orc_ppd_basic.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_ppd_basic.q.out
@@ -201,7 +201,7 @@ POSTHOOK: Lineage: orc_ppd.v EXPRESSION [(orc_ppd_staging)orc_ppd_staging.FieldS
 PREHOOK: query: select count(*) from orc_ppd
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 16673
    HDFS_BYTES_WRITTEN: 104
@@ -227,7 +227,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t > 127
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -241,7 +241,7 @@ Stage-1 HIVE COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = 55
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 1055
    HDFS_BYTES_WRITTEN: 101
@@ -268,7 +268,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t <=> 50
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 102
@@ -293,7 +293,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t <=> 100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 102
@@ -318,7 +318,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = "54"
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 102
@@ -343,7 +343,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = -10.0
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -368,7 +368,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = cast(53 as float)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 102
@@ -393,7 +393,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = cast(53 as double)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 102
@@ -418,7 +418,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t < 100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 104
@@ -443,7 +443,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t < 100 and t > 98
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 102
@@ -468,7 +468,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t <= 100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 104
@@ -493,7 +493,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t is null
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -518,7 +518,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t in (5, 120)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 102
@@ -543,7 +543,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t between 60 and 80
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 103
@@ -568,7 +568,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = -100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -582,7 +582,7 @@ Stage-1 HIVE COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t <=> -100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -596,7 +596,7 @@ Stage-1 HIVE COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = 125
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -618,7 +618,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t IN (-100, 125, 200)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -640,7 +640,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s > "zzz"
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -654,7 +654,7 @@ Stage-1 HIVE COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s = "zach young"
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 5691
    HDFS_BYTES_WRITTEN: 101
@@ -681,7 +681,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s <=> "zach zipper"
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -706,7 +706,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s <=> ""
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -731,7 +731,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s is null
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -745,7 +745,7 @@ Stage-1 HIVE COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s is not null
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 104
@@ -770,7 +770,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s = cast("zach young" as char(50))
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -792,7 +792,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s = cast("zach young" as char(10))
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -817,7 +817,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s = cast("zach young" as varchar(10))
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -842,7 +842,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s = cast("zach young" as varchar(50))
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -867,7 +867,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s < "b"
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 102
@@ -892,7 +892,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s > "alice" and s < "bob"
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 102
@@ -917,7 +917,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s in ("alice allen", "")
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 102
@@ -942,7 +942,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s between "" and "alice allen"
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 102
@@ -967,7 +967,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s between "zz" and "zzz"
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -992,7 +992,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s between "zach zipper" and "zzz"
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -1017,7 +1017,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s = "hello world"
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -1039,7 +1039,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s <=> "apache hive"
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -1061,7 +1061,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s IN ("a", "z")
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -1083,7 +1083,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s = "sarah ovid"
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -1108,7 +1108,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s = "wendy king"
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -1133,7 +1133,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s = "wendy king" and t < 0
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -1158,7 +1158,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s = "wendy king" and t > 100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -1183,7 +1183,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where f=74.72
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 4912
    HDFS_BYTES_WRITTEN: 101
@@ -1210,7 +1210,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where f=74.72
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 1751
    HDFS_BYTES_WRITTEN: 101
@@ -1237,7 +1237,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where f=74.72
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -1262,7 +1262,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where f=74.72
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/orc_ppd_schema_evol_3a.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_ppd_schema_evol_3a.q.out b/ql/src/test/results/clientpositive/llap/orc_ppd_schema_evol_3a.q.out
index 1157edb..ff7df63 100644
--- a/ql/src/test/results/clientpositive/llap/orc_ppd_schema_evol_3a.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_ppd_schema_evol_3a.q.out
@@ -201,7 +201,7 @@ POSTHOOK: Lineage: orc_ppd.v EXPRESSION [(orc_ppd_staging)orc_ppd_staging.FieldS
 PREHOOK: query: select count(*) from orc_ppd where t > 127
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 17008
    HDFS_BYTES_WRITTEN: 101
@@ -228,7 +228,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t > 127
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -242,7 +242,7 @@ Stage-1 HIVE COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = 55
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -267,7 +267,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = 55
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 720
    HDFS_BYTES_WRITTEN: 101
@@ -294,7 +294,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = 54
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 102
@@ -319,7 +319,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = 54
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 102
@@ -348,7 +348,7 @@ PREHOOK: Output: default@orc_ppd
 PREHOOK: query: select count(*) from orc_ppd where t > 127
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -373,7 +373,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t > 127
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -387,7 +387,7 @@ Stage-1 HIVE COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = 55
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -412,7 +412,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = 55
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -437,7 +437,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = 54
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 102
@@ -462,7 +462,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = 54
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 102
@@ -491,7 +491,7 @@ PREHOOK: Output: default@orc_ppd
 PREHOOK: query: select count(*) from orc_ppd where t > 127
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -516,7 +516,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t > 127
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -530,7 +530,7 @@ Stage-1 HIVE COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = 55
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -555,7 +555,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = 55
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -580,7 +580,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = 54
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 102
@@ -605,7 +605,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = 54
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 102
@@ -634,7 +634,7 @@ PREHOOK: Output: default@orc_ppd
 PREHOOK: query: select count(*) from orc_ppd where t > 127
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -659,7 +659,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t > 127
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -673,7 +673,7 @@ Stage-1 HIVE COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = 55
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -698,7 +698,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = 55
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -723,7 +723,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = 54
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 102
@@ -748,7 +748,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = 54
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 102
@@ -777,7 +777,7 @@ PREHOOK: Output: default@orc_ppd
 PREHOOK: query: select count(*) from orc_ppd where t > '127'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 16898
    HDFS_BYTES_WRITTEN: 104
@@ -796,7 +796,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t > '127'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 17728
    HDFS_BYTES_WRITTEN: 104
@@ -815,7 +815,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = '55'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 16898
    HDFS_BYTES_WRITTEN: 101
@@ -834,7 +834,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = '55'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 17728
    HDFS_BYTES_WRITTEN: 101
@@ -853,7 +853,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = '54'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 16898
    HDFS_BYTES_WRITTEN: 102
@@ -872,7 +872,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where t = '54'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 17728
    HDFS_BYTES_WRITTEN: 102
@@ -891,7 +891,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where f = 74.72
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 4912
    HDFS_BYTES_WRITTEN: 101
@@ -918,7 +918,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where f = 74.72
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 1751
    HDFS_BYTES_WRITTEN: 101
@@ -949,7 +949,7 @@ PREHOOK: Output: default@orc_ppd
 PREHOOK: query: select count(*) from orc_ppd where f = 74.72
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 21458
    HDFS_BYTES_WRITTEN: 101
@@ -968,7 +968,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where f = 74.72
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 23336
    HDFS_BYTES_WRITTEN: 101
@@ -991,7 +991,7 @@ PREHOOK: Output: default@orc_ppd
 PREHOOK: query: select count(*) from orc_ppd where f = '74.72'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 21458
    HDFS_BYTES_WRITTEN: 101
@@ -1010,7 +1010,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where f = '74.72'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 23336
    HDFS_BYTES_WRITTEN: 101
@@ -1029,7 +1029,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s = 'bob davidson'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 4099
    HDFS_BYTES_WRITTEN: 101
@@ -1056,7 +1056,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s = 'bob davidson'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 1592
    HDFS_BYTES_WRITTEN: 101
@@ -1087,7 +1087,7 @@ PREHOOK: Output: default@orc_ppd
 PREHOOK: query: select count(*) from orc_ppd where s = 'bob davidson'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 20629
    HDFS_BYTES_WRITTEN: 101
@@ -1106,7 +1106,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s = 'bob davidson'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 22364
    HDFS_BYTES_WRITTEN: 101
@@ -1129,7 +1129,7 @@ PREHOOK: Output: default@orc_ppd
 PREHOOK: query: select count(*) from orc_ppd where s = 'bob davidson'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -1154,7 +1154,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s = 'bob davidson'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -1183,7 +1183,7 @@ PREHOOK: Output: default@orc_ppd
 PREHOOK: query: select count(*) from orc_ppd where s = 'bob davidson'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 20629
    HDFS_BYTES_WRITTEN: 101
@@ -1202,7 +1202,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s = 'bob davidson'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 22364
    HDFS_BYTES_WRITTEN: 101
@@ -1225,7 +1225,7 @@ PREHOOK: Output: default@orc_ppd
 PREHOOK: query: select count(*) from orc_ppd where s = 'bob davidson'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -1250,7 +1250,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where s = 'bob davidson'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 0
    HDFS_BYTES_WRITTEN: 101
@@ -1279,7 +1279,7 @@ PREHOOK: Output: default@orc_ppd
 PREHOOK: query: select count(*) from orc_ppd where si = 442
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 2183
    HDFS_BYTES_WRITTEN: 101
@@ -1306,7 +1306,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where si = 442 or boo is not null or boo = false
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 18747
    HDFS_BYTES_WRITTEN: 101
@@ -1325,7 +1325,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where si = 442
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 1217
    HDFS_BYTES_WRITTEN: 101
@@ -1352,7 +1352,7 @@ Stage-1 LLAP IO COUNTERS:
 PREHOOK: query: select count(*) from orc_ppd where si = 442 or boo is not null or boo = false
 PREHOOK: type: QUERY
 PREHOOK: Input: default@orc_ppd
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 Stage-1 FILE SYSTEM COUNTERS:
    HDFS_BYTES_READ: 20073
    HDFS_BYTES_WRITTEN: 101

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/parallel_colstats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/parallel_colstats.q.out b/ql/src/test/results/clientpositive/llap/parallel_colstats.q.out
index 4ac3fbb..3b53183 100644
--- a/ql/src/test/results/clientpositive/llap/parallel_colstats.q.out
+++ b/ql/src/test/results/clientpositive/llap/parallel_colstats.q.out
@@ -225,11 +225,11 @@ POSTHOOK: Lineage: src_b.value SIMPLE [(src)src.FieldSchema(name:value, type:str
 PREHOOK: query: select * from src_a
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_a
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from src_a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_a
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0	val_0
 10	val_10
 100	val_100
@@ -542,11 +542,11 @@ POSTHOOK: Input: default@src_a
 PREHOOK: query: select * from src_b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from src_b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0	val_0
 10	val_10
 100	val_100
@@ -877,11 +877,11 @@ POSTHOOK: Lineage: src_b.value SIMPLE [(src)src.FieldSchema(name:value, type:str
 PREHOOK: query: select * from src_a
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_a
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from src_a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_a
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0	val_0
 10	val_10
 100	val_100
@@ -1194,11 +1194,11 @@ POSTHOOK: Input: default@src_a
 PREHOOK: query: select * from src_b
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from src_b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 0	val_0
 10	val_10
 100	val_100

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/parquet_complex_types_vectorization.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/parquet_complex_types_vectorization.q.out b/ql/src/test/results/clientpositive/llap/parquet_complex_types_vectorization.q.out
index cedbb3d..f4d6218 100644
--- a/ql/src/test/results/clientpositive/llap/parquet_complex_types_vectorization.q.out
+++ b/ql/src/test/results/clientpositive/llap/parquet_complex_types_vectorization.q.out
@@ -78,11 +78,11 @@ POSTHOOK: Lineage: parquet_complex_types.st1 SIMPLE [(parquet_complex_types_stag
 PREHOOK: query: select count(*) from parquet_complex_types
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_complex_types
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from parquet_complex_types
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_complex_types
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1023
 PREHOOK: query: explain vectorization expression select l1, l1[0], l1[1], l1[listIndex], listIndex from parquet_complex_types limit 10
 PREHOOK: type: QUERY
@@ -154,11 +154,11 @@ STAGE PLANS:
 PREHOOK: query: select l1, l1[0], l1[1], l1[listIndex], listIndex from parquet_complex_types limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_complex_types
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select l1, l1[0], l1[1], l1[listIndex], listIndex from parquet_complex_types limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_complex_types
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 [100,101]	100	101	100	0
 [102,103]	102	103	103	1
 [104,105]	104	105	104	0
@@ -333,11 +333,11 @@ STAGE PLANS:
 PREHOOK: query: select sum(l1[0]), l1[1] from parquet_complex_types where l1[0] > 1000 group by l1[1] order by l1[1] desc limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_complex_types
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select sum(l1[0]), l1[1] from parquet_complex_types where l1[0] > 1000 group by l1[1] order by l1[1] desc limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_complex_types
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 2144	2145
 2142	2143
 2140	2141
@@ -366,11 +366,11 @@ POSTHOOK: Lineage: parquet_complex_types.st1 SIMPLE [(parquet_complex_types_stag
 PREHOOK: query: select count(*) from parquet_complex_types
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_complex_types
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from parquet_complex_types
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_complex_types
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1024
 PREHOOK: query: explain vectorization expression select l1, l1[0], l1[1], l1[listIndex], listIndex from parquet_complex_types limit 10
 PREHOOK: type: QUERY
@@ -442,11 +442,11 @@ STAGE PLANS:
 PREHOOK: query: select l1, l1[0], l1[1], l1[listIndex], listIndex from parquet_complex_types limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_complex_types
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select l1, l1[0], l1[1], l1[listIndex], listIndex from parquet_complex_types limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_complex_types
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 [100,101]	100	101	100	0
 [102,103]	102	103	103	1
 [104,105]	104	105	104	0
@@ -621,11 +621,11 @@ STAGE PLANS:
 PREHOOK: query: select sum(l1[0]), l1[1] from parquet_complex_types where l1[0] > 1000 group by l1[1] order by l1[1] desc limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_complex_types
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select sum(l1[0]), l1[1] from parquet_complex_types where l1[0] > 1000 group by l1[1] order by l1[1] desc limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_complex_types
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 2146	2147
 2144	2145
 2142	2143
@@ -654,11 +654,11 @@ POSTHOOK: Lineage: parquet_complex_types.st1 SIMPLE [(parquet_complex_types_stag
 PREHOOK: query: select count(*) from parquet_complex_types
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_complex_types
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from parquet_complex_types
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_complex_types
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1025
 PREHOOK: query: explain vectorization expression select l1, l1[0], l1[1], l1[listIndex], listIndex from parquet_complex_types limit 10
 PREHOOK: type: QUERY
@@ -730,11 +730,11 @@ STAGE PLANS:
 PREHOOK: query: select l1, l1[0], l1[1], l1[listIndex], listIndex from parquet_complex_types limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_complex_types
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select l1, l1[0], l1[1], l1[listIndex], listIndex from parquet_complex_types limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_complex_types
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 [100,101]	100	101	100	0
 [102,103]	102	103	103	1
 [104,105]	104	105	104	0
@@ -909,11 +909,11 @@ STAGE PLANS:
 PREHOOK: query: select sum(l1[0]), l1[1] from parquet_complex_types where l1[0] > 1000 group by l1[1] order by l1[1] desc limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_complex_types
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select sum(l1[0]), l1[1] from parquet_complex_types where l1[0] > 1000 group by l1[1] order by l1[1] desc limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_complex_types
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 2148	2149
 2146	2147
 2144	2145

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/parquet_map_type_vectorization.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/parquet_map_type_vectorization.q.out b/ql/src/test/results/clientpositive/llap/parquet_map_type_vectorization.q.out
index ae7db3f..1d70e06 100644
--- a/ql/src/test/results/clientpositive/llap/parquet_map_type_vectorization.q.out
+++ b/ql/src/test/results/clientpositive/llap/parquet_map_type_vectorization.q.out
@@ -88,11 +88,11 @@ POSTHOOK: Lineage: parquet_map_type.stringmap SIMPLE [(parquet_map_type_staging)
 PREHOOK: query: select count(*) from parquet_map_type
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_map_type
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from parquet_map_type
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_map_type
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1023
 PREHOOK: query: explain vectorization expression select stringMap, intMap, doubleMap, stringMap['k2'], intMap[456],
 doubleMap[123.123], stringMap[stringIndex], intMap[intIndex], doubleMap[doubleIndex] from parquet_map_type limit 10
@@ -167,12 +167,12 @@ PREHOOK: query: select stringMap, intMap, doubleMap, stringMap['k2'], intMap[456
 stringMap[stringIndex], intMap[intIndex], doubleMap[doubleIndex] from parquet_map_type limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_map_type
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select stringMap, intMap, doubleMap, stringMap['k2'], intMap[456], doubleMap[123.123],
 stringMap[stringIndex], intMap[intIndex], doubleMap[doubleIndex] from parquet_map_type limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_map_type
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 {"k1":"v1","k2":"v1-2"}	{456:2,123:1}	{123.123:1.1,456.456:1.2}	v1-2	2	1.1	v1	1	1.2
 {"k1":"v2","k2":"v2-2"}	{456:4,123:3}	{123.123:2.1,456.456:2.2}	v2-2	4	2.1	v2	3	2.2
 {"k1":"v3","k2":"v3-2"}	{456:6,123:5}	{123.123:3.1,456.456:3.2}	v3-2	6	3.1	v3	5	3.2
@@ -350,12 +350,12 @@ PREHOOK: query: select sum(intMap[123]), sum(doubleMap[123.123]), stringMap['k1'
 from parquet_map_type where stringMap['k1'] like 'v100%' group by stringMap['k1'] order by stringMap['k1'] limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_map_type
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select sum(intMap[123]), sum(doubleMap[123.123]), stringMap['k1']
 from parquet_map_type where stringMap['k1'] like 'v100%' group by stringMap['k1'] order by stringMap['k1'] limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_map_type
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 199	100.1	v100
 1999	1000.1	v1000
 2001	1001.1	v1001
@@ -386,22 +386,22 @@ POSTHOOK: Lineage: parquet_map_type.stringmap SIMPLE [(parquet_map_type_staging)
 PREHOOK: query: select count(*) from parquet_map_type
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_map_type
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from parquet_map_type
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_map_type
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1024
 PREHOOK: query: select stringMap, intMap, doubleMap, stringMap['k2'], intMap[456], doubleMap[123.123],
 stringMap[stringIndex], intMap[intIndex], doubleMap[doubleIndex] from parquet_map_type limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_map_type
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select stringMap, intMap, doubleMap, stringMap['k2'], intMap[456], doubleMap[123.123],
 stringMap[stringIndex], intMap[intIndex], doubleMap[doubleIndex] from parquet_map_type limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_map_type
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 {"k1":"v1","k2":"v1-2"}	{456:2,123:1}	{123.123:1.1,456.456:1.2}	v1-2	2	1.1	v1	1	1.2
 {"k1":"v2","k2":"v2-2"}	{456:4,123:3}	{123.123:2.1,456.456:2.2}	v2-2	4	2.1	v2	3	2.2
 {"k1":"v3","k2":"v3-2"}	{456:6,123:5}	{123.123:3.1,456.456:3.2}	v3-2	6	3.1	v3	5	3.2
@@ -416,12 +416,12 @@ PREHOOK: query: select sum(intMap[123]), sum(doubleMap[123.123]), stringMap['k1'
 from parquet_map_type where stringMap['k1'] like 'v100%' group by stringMap['k1'] order by stringMap['k1'] limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_map_type
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select sum(intMap[123]), sum(doubleMap[123.123]), stringMap['k1']
 from parquet_map_type where stringMap['k1'] like 'v100%' group by stringMap['k1'] order by stringMap['k1'] limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_map_type
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 199	100.1	v100
 1999	1000.1	v1000
 2001	1001.1	v1001
@@ -452,22 +452,22 @@ POSTHOOK: Lineage: parquet_map_type.stringmap SIMPLE [(parquet_map_type_staging)
 PREHOOK: query: select count(*) from parquet_map_type
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_map_type
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from parquet_map_type
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_map_type
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1025
 PREHOOK: query: select stringMap, intMap, doubleMap, stringMap['k2'], intMap[456], doubleMap[123.123],
 stringMap[stringIndex], intMap[intIndex], doubleMap[doubleIndex] from parquet_map_type limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_map_type
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select stringMap, intMap, doubleMap, stringMap['k2'], intMap[456], doubleMap[123.123],
 stringMap[stringIndex], intMap[intIndex], doubleMap[doubleIndex] from parquet_map_type limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_map_type
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 {"k1":"v1","k2":"v1-2"}	{456:2,123:1}	{123.123:1.1,456.456:1.2}	v1-2	2	1.1	v1	1	1.2
 {"k1":"v2","k2":"v2-2"}	{456:4,123:3}	{123.123:2.1,456.456:2.2}	v2-2	4	2.1	v2	3	2.2
 {"k1":"v3","k2":"v3-2"}	{456:6,123:5}	{123.123:3.1,456.456:3.2}	v3-2	6	3.1	v3	5	3.2
@@ -482,12 +482,12 @@ PREHOOK: query: select sum(intMap[123]), sum(doubleMap[123.123]), stringMap['k1'
 from parquet_map_type where stringMap['k1'] like 'v100%' group by stringMap['k1'] order by stringMap['k1'] limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_map_type
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select sum(intMap[123]), sum(doubleMap[123.123]), stringMap['k1']
 from parquet_map_type where stringMap['k1'] like 'v100%' group by stringMap['k1'] order by stringMap['k1'] limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_map_type
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 199	100.1	v100
 1999	1000.1	v1000
 2001	1001.1	v1001

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/parquet_types_vectorization.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/parquet_types_vectorization.q.out b/ql/src/test/results/clientpositive/llap/parquet_types_vectorization.q.out
index dd0ff2b..d62d947 100644
--- a/ql/src/test/results/clientpositive/llap/parquet_types_vectorization.q.out
+++ b/ql/src/test/results/clientpositive/llap/parquet_types_vectorization.q.out
@@ -99,11 +99,11 @@ POSTHOOK: Output: default@parquet_types_staging
 PREHOOK: query: SELECT * FROM parquet_types_staging
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_types_staging
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT * FROM parquet_types_staging
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_types_staging
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 100	1	1	1.0	0.0	abc	2011-01-01 01:01:01.111111111	a    	a  	B4F3CAFDBEDD	{"k1":"v1"}	[101,200]	{"c1":10,"c2":"a"}	2011-01-01
 101	2	2	1.1	0.3	def	2012-02-02 02:02:02.222222222	ab   	ab 	68692CCAC0BDE7	{"k2":"v2"}	[102,200]	{"c1":10,"c2":"d"}	2012-02-02
 102	3	3	1.2	0.6	ghi	2013-03-03 03:03:03.333333333	abc  	abc	B4F3CAFDBEDD	{"k3":"v3"}	[103,200]	{"c1":10,"c2":"g"}	2013-03-03
@@ -258,7 +258,7 @@ GROUP BY ctinyint
 ORDER BY ctinyint
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_types
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT ctinyint,
   MAX(cint),
   MIN(csmallint),
@@ -270,7 +270,7 @@ GROUP BY ctinyint
 ORDER BY ctinyint
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_types
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1	121	1	8	1.175	2.06216
 2	119	1	7	1.21429	1.8
 3	120	1	7	1.17143	1.8
@@ -352,11 +352,11 @@ STAGE PLANS:
 PREHOOK: query: SELECT cfloat, count(*) FROM parquet_types GROUP BY cfloat ORDER BY cfloat
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_types
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT cfloat, count(*) FROM parquet_types GROUP BY cfloat ORDER BY cfloat
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_types
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1.0	5
 1.1	5
 1.2	4
@@ -440,11 +440,11 @@ STAGE PLANS:
 PREHOOK: query: SELECT cchar, count(*) FROM parquet_types GROUP BY cchar ORDER BY cchar
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_types
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT cchar, count(*) FROM parquet_types GROUP BY cchar ORDER BY cchar
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_types
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 a    	1
 ab   	1
 abc  	1
@@ -541,11 +541,11 @@ STAGE PLANS:
 PREHOOK: query: SELECT cvarchar, count(*) FROM parquet_types GROUP BY cvarchar ORDER BY cvarchar
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_types
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT cvarchar, count(*) FROM parquet_types GROUP BY cvarchar ORDER BY cvarchar
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_types
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 B4F3CAFDBE	1
 a  	1
 ab 	1
@@ -638,11 +638,11 @@ STAGE PLANS:
 PREHOOK: query: SELECT cstring1, count(*) FROM parquet_types GROUP BY cstring1 ORDER BY cstring1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_types
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT cstring1, count(*) FROM parquet_types GROUP BY cstring1 ORDER BY cstring1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_types
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 abc	1
 bcd	1
 cde	1
@@ -742,11 +742,11 @@ STAGE PLANS:
 PREHOOK: query: SELECT t, count(*) FROM parquet_types GROUP BY t ORDER BY t
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_types
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT t, count(*) FROM parquet_types GROUP BY t ORDER BY t
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_types
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 2011-01-01 01:01:01.111111111	1
 2012-02-02 02:02:02.222222222	1
 2013-03-03 03:03:03.333333333	1
@@ -838,11 +838,11 @@ STAGE PLANS:
 PREHOOK: query: SELECT hex(cbinary), count(*) FROM parquet_types GROUP BY cbinary
 PREHOOK: type: QUERY
 PREHOOK: Input: default@parquet_types
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT hex(cbinary), count(*) FROM parquet_types GROUP BY cbinary
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_types
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 68692CCAC0BDE7	10
 	1
 68656C6C6F	1

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/rcfile_createas1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/rcfile_createas1.q.out b/ql/src/test/results/clientpositive/llap/rcfile_createas1.q.out
index 36b8c47..2d46169 100644
--- a/ql/src/test/results/clientpositive/llap/rcfile_createas1.q.out
+++ b/ql/src/test/results/clientpositive/llap/rcfile_createas1.q.out
@@ -104,7 +104,7 @@ STAGE PLANS:
     Move Operator
       files:
           hdfs directory: true
-#### A masked pattern was here ####
+          destination: hdfs://### HDFS PATH ###
 
 PREHOOK: query: CREATE TABLE rcfile_createas1b
     STORED AS RCFILE AS 
@@ -137,7 +137,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@rcfile_createas1a
 PREHOOK: Input: default@rcfile_createas1a@ds=1
 PREHOOK: Input: default@rcfile_createas1a@ds=2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(key, value) USING 'tr \t _' AS (c)
     FROM rcfile_createas1a
@@ -146,7 +146,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@rcfile_createas1a
 POSTHOOK: Input: default@rcfile_createas1a@ds=1
 POSTHOOK: Input: default@rcfile_createas1a@ds=2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 14412220296
 PREHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(key, value) USING 'tr \t _' AS (c)
@@ -154,14 +154,14 @@ PREHOOK: query: SELECT SUM(HASH(c)) FROM (
 ) t
 PREHOOK: type: QUERY
 PREHOOK: Input: default@rcfile_createas1b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(key, value) USING 'tr \t _' AS (c)
     FROM rcfile_createas1b
 ) t
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@rcfile_createas1b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 14412220296
 PREHOOK: query: DROP TABLE rcfile_createas1a
 PREHOOK: type: DROPTABLE

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/rcfile_merge2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/rcfile_merge2.q.out b/ql/src/test/results/clientpositive/llap/rcfile_merge2.q.out
index 4ff5569..afdc8f8 100644
--- a/ql/src/test/results/clientpositive/llap/rcfile_merge2.q.out
+++ b/ql/src/test/results/clientpositive/llap/rcfile_merge2.q.out
@@ -218,7 +218,7 @@ PREHOOK: Input: default@rcfile_merge2a@one=1/two=8/three=0
 PREHOOK: Input: default@rcfile_merge2a@one=1/two=8/three=6
 PREHOOK: Input: default@rcfile_merge2a@one=1/two=9/three=1
 PREHOOK: Input: default@rcfile_merge2a@one=1/two=9/three=7
-#### 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 rcfile_merge2a
@@ -245,7 +245,7 @@ POSTHOOK: Input: default@rcfile_merge2a@one=1/two=8/three=0
 POSTHOOK: Input: default@rcfile_merge2a@one=1/two=8/three=6
 POSTHOOK: Input: default@rcfile_merge2a@one=1/two=9/three=1
 POSTHOOK: Input: default@rcfile_merge2a@one=1/two=9/three=7
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 -4209012844
 PREHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(key, value, '1', PMOD(HASH(key), 10), 
@@ -254,7 +254,7 @@ PREHOOK: query: SELECT SUM(HASH(c)) FROM (
 ) t
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(key, value, '1', PMOD(HASH(key), 10), 
         PMOD(HASH(value), 10)) USING 'tr \t _' AS (c)
@@ -262,7 +262,7 @@ POSTHOOK: query: SELECT SUM(HASH(c)) FROM (
 ) t
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 -4209012844
 PREHOOK: query: DROP TABLE rcfile_merge2a
 PREHOOK: type: DROPTABLE

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/rcfile_merge3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/rcfile_merge3.q.out b/ql/src/test/results/clientpositive/llap/rcfile_merge3.q.out
index 575be85..08c76d1 100644
--- a/ql/src/test/results/clientpositive/llap/rcfile_merge3.q.out
+++ b/ql/src/test/results/clientpositive/llap/rcfile_merge3.q.out
@@ -161,7 +161,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@rcfile_merge3a
 PREHOOK: Input: default@rcfile_merge3a@ds=1
 PREHOOK: Input: default@rcfile_merge3a@ds=2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(key, value) USING 'tr \t _' AS (c)
     FROM rcfile_merge3a
@@ -170,7 +170,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@rcfile_merge3a
 POSTHOOK: Input: default@rcfile_merge3a@ds=1
 POSTHOOK: Input: default@rcfile_merge3a@ds=2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 14412220296
 PREHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(key, value) USING 'tr \t _' AS (c)
@@ -178,14 +178,14 @@ PREHOOK: query: SELECT SUM(HASH(c)) FROM (
 ) t
 PREHOOK: type: QUERY
 PREHOOK: Input: default@rcfile_merge3b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(key, value) USING 'tr \t _' AS (c)
     FROM rcfile_merge3b
 ) t
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@rcfile_merge3b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 14412220296
 PREHOOK: query: DROP TABLE rcfile_merge3a
 PREHOOK: type: DROPTABLE

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/rcfile_merge4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/rcfile_merge4.q.out b/ql/src/test/results/clientpositive/llap/rcfile_merge4.q.out
index f22e01a..3fe587b 100644
--- a/ql/src/test/results/clientpositive/llap/rcfile_merge4.q.out
+++ b/ql/src/test/results/clientpositive/llap/rcfile_merge4.q.out
@@ -161,7 +161,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@rcfile_merge3a
 PREHOOK: Input: default@rcfile_merge3a@ds=1
 PREHOOK: Input: default@rcfile_merge3a@ds=2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(key, value) USING 'tr \t _' AS (c)
     FROM rcfile_merge3a
@@ -170,7 +170,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@rcfile_merge3a
 POSTHOOK: Input: default@rcfile_merge3a@ds=1
 POSTHOOK: Input: default@rcfile_merge3a@ds=2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 14412220296
 PREHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(key, value) USING 'tr \t _' AS (c)
@@ -178,14 +178,14 @@ PREHOOK: query: SELECT SUM(HASH(c)) FROM (
 ) t
 PREHOOK: type: QUERY
 PREHOOK: Input: default@rcfile_merge3b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(key, value) USING 'tr \t _' AS (c)
     FROM rcfile_merge3b
 ) t
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@rcfile_merge3b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 14412220296
 PREHOOK: query: DROP TABLE rcfile_merge3a
 PREHOOK: type: DROPTABLE

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/reduce_deduplicate.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/reduce_deduplicate.q.out b/ql/src/test/results/clientpositive/llap/reduce_deduplicate.q.out
index fd8cc20..68c2af2 100644
--- a/ql/src/test/results/clientpositive/llap/reduce_deduplicate.q.out
+++ b/ql/src/test/results/clientpositive/llap/reduce_deduplicate.q.out
@@ -50,9 +50,9 @@ STAGE PLANS:
             Execution mode: llap
             LLAP IO: no inputs
             Path -> Alias:
-#### A masked pattern was here ####
+              hdfs://### HDFS PATH ### [src]
             Path -> Partition:
-#### A masked pattern was here ####
+              hdfs://### HDFS PATH ### 
                 Partition
                   base file name: src
                   input format: org.apache.hadoop.mapred.TextInputFormat
@@ -65,6 +65,7 @@ STAGE PLANS:
                     columns.comments 'default','default'
                     columns.types string:string
 #### A masked pattern was here ####
+                    location hdfs://### HDFS PATH ###
                     name default.src
                     numFiles 1
                     numRows 500
@@ -86,6 +87,7 @@ STAGE PLANS:
                       columns.comments 'default','default'
                       columns.types string:string
 #### A masked pattern was here ####
+                      location hdfs://### HDFS PATH ###
                       name default.src
                       numFiles 1
                       numRows 500
@@ -111,10 +113,10 @@ STAGE PLANS:
                 File Output Operator
                   compressed: false
                   GlobalTableId: 1
-#### A masked pattern was here ####
+                  directory: hdfs://### HDFS PATH ###
                   NumFilesPerFileSink: 2
                   Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
-#### A masked pattern was here ####
+                  Stats Publishing Key Prefix: hdfs://### HDFS PATH ###
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -127,6 +129,7 @@ STAGE PLANS:
                         columns.comments 
                         columns.types string:string
 #### A masked pattern was here ####
+                        location hdfs://### HDFS PATH ###
                         name default.bucket5_1
                         numFiles 0
                         numRows 0
@@ -157,10 +160,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: 880 Basic stats: COMPLETE Column stats: COMPLETE
-#### 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
@@ -184,7 +187,7 @@ STAGE PLANS:
     Move Operator
       tables:
           replace: true
-#### A masked pattern was here ####
+          source: hdfs://### HDFS PATH ###
           table:
               input format: org.apache.hadoop.mapred.TextInputFormat
               output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -197,6 +200,7 @@ STAGE PLANS:
                 columns.comments 
                 columns.types string:string
 #### A masked pattern was here ####
+                location hdfs://### HDFS PATH ###
                 name default.bucket5_1
                 numFiles 0
                 numRows 0
@@ -212,7 +216,7 @@ STAGE PLANS:
   Stage: Stage-3
     Stats Work
       Basic Stats Work:
-#### A masked pattern was here ####
+          Stats Aggregation Key Prefix: hdfs://### HDFS PATH ###
       Column Stats Desc:
           Columns: key, value
           Column Types: string, string
@@ -234,20 +238,20 @@ POSTHOOK: Lineage: bucket5_1.value SIMPLE [(src)src.FieldSchema(name:value, type
 PREHOOK: query: select sum(hash(key)),sum(hash(value)) from bucket5_1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@bucket5_1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select sum(hash(key)),sum(hash(value)) from bucket5_1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@bucket5_1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 21025334	36210398070
 PREHOOK: query: select sum(hash(key)),sum(hash(value)) from src
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select sum(hash(key)),sum(hash(value)) from src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 21025334	36210398070
 PREHOOK: query: create table complex_tbl_1(aid string, bid string, t int, ctime string, etime bigint, l string, et string) partitioned by (ds string)
 PREHOOK: type: CREATETABLE
@@ -371,11 +375,11 @@ STAGE PLANS:
                   File Output Operator
                     compressed: false
                     GlobalTableId: 1
-#### A masked pattern was here ####
+                    directory: hdfs://### HDFS PATH ###
                     NumFilesPerFileSink: 1
                     Static Partition Specification: ds=2010-03-29/
                     Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: PARTIAL
-#### A masked pattern was here ####
+                    Stats Publishing Key Prefix: hdfs://### HDFS PATH ###
                     table:
                         input format: org.apache.hadoop.mapred.TextInputFormat
                         output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -386,6 +390,7 @@ STAGE PLANS:
                           columns.comments 
                           columns.types string:string:int:string:bigint:string:string
 #### A masked pattern was here ####
+                          location hdfs://### HDFS PATH ###
                           name default.complex_tbl_1
                           partition_columns ds
                           partition_columns.types string
@@ -434,10 +439,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: 3174 Basic stats: COMPLETE Column stats: PARTIAL
-#### 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
@@ -463,7 +468,7 @@ STAGE PLANS:
           partition:
             ds 2010-03-29
           replace: true
-#### A masked pattern was here ####
+          source: hdfs://### HDFS PATH ###
           table:
               input format: org.apache.hadoop.mapred.TextInputFormat
               output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -474,6 +479,7 @@ STAGE PLANS:
                 columns.comments 
                 columns.types string:string:int:string:bigint:string:string
 #### A masked pattern was here ####
+                location hdfs://### HDFS PATH ###
                 name default.complex_tbl_1
                 partition_columns ds
                 partition_columns.types string
@@ -487,7 +493,7 @@ STAGE PLANS:
   Stage: Stage-3
     Stats Work
       Basic Stats Work:
-#### A masked pattern was here ####
+          Stats Aggregation Key Prefix: hdfs://### HDFS PATH ###
       Column Stats Desc:
           Columns: aid, bid, t, ctime, etime, l, et
           Column Types: string, string, int, string, bigint, string, string

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/reduce_deduplicate_distinct.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/reduce_deduplicate_distinct.q.out b/ql/src/test/results/clientpositive/llap/reduce_deduplicate_distinct.q.out
index d61a0df..b87a096 100644
--- a/ql/src/test/results/clientpositive/llap/reduce_deduplicate_distinct.q.out
+++ b/ql/src/test/results/clientpositive/llap/reduce_deduplicate_distinct.q.out
@@ -87,13 +87,13 @@ from count_distinct_test
 group by id
 PREHOOK: type: QUERY
 PREHOOK: Input: default@count_distinct_test
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select id,count(distinct key),count(distinct name)
 from count_distinct_test
 group by id
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@count_distinct_test
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1	5	2
 PREHOOK: query: explain select id,count(Distinct key),count(Distinct name)
 from (select id,key,name from count_distinct_test group by id,key,name)m
@@ -184,13 +184,13 @@ from (select id,key,name from count_distinct_test group by id,key,name)m
 group by id
 PREHOOK: type: QUERY
 PREHOOK: Input: default@count_distinct_test
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select id,count(Distinct key),count(Distinct name)
 from (select id,key,name from count_distinct_test group by id,key,name)m
 group by id
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@count_distinct_test
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1	5	2
 PREHOOK: query: explain select id,count(Distinct name),count(Distinct key)
 from (select id,key,name from count_distinct_test group by id,name,key)m
@@ -281,13 +281,13 @@ from (select id,key,name from count_distinct_test group by id,name,key)m
 group by id
 PREHOOK: type: QUERY
 PREHOOK: Input: default@count_distinct_test
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select id,count(Distinct name),count(Distinct key)
 from (select id,key,name from count_distinct_test group by id,name,key)m
 group by id
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@count_distinct_test
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1	2	5
 PREHOOK: query: explain select id,count(Distinct key),count(Distinct name)
 from (select id,key,name from count_distinct_test group by id,key,name)m
@@ -378,13 +378,13 @@ from (select id,key,name from count_distinct_test group by id,key,name)m
 group by id
 PREHOOK: type: QUERY
 PREHOOK: Input: default@count_distinct_test
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select id,count(Distinct key),count(Distinct name)
 from (select id,key,name from count_distinct_test group by id,key,name)m
 group by id
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@count_distinct_test
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1	5	2
 PREHOOK: query: explain select id,count(Distinct name),count(Distinct key)
 from (select id,key,name from count_distinct_test group by id,name,key)m
@@ -475,11 +475,11 @@ from (select id,key,name from count_distinct_test group by id,name,key)m
 group by id
 PREHOOK: type: QUERY
 PREHOOK: Input: default@count_distinct_test
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select id,count(Distinct name),count(Distinct key)
 from (select id,key,name from count_distinct_test group by id,name,key)m
 group by id
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@count_distinct_test
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1	2	5

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/remote_script.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/remote_script.q.out b/ql/src/test/results/clientpositive/llap/remote_script.q.out
index 87531f0..315c5c5 100644
--- a/ql/src/test/results/clientpositive/llap/remote_script.q.out
+++ b/ql/src/test/results/clientpositive/llap/remote_script.q.out
@@ -23,11 +23,11 @@ POSTHOOK: Lineage: tmp_tmp.value SCRIPT [(src)src.FieldSchema(name:key, type:str
 PREHOOK: query: select * from tmp_tmp ORDER BY key ASC, value ASC
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tmp_tmp
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select * from tmp_tmp ORDER BY key ASC, value ASC
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tmp_tmp
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 1	2	NULL
 1	2	NULL
 1

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/schemeAuthority.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schemeAuthority.q.out b/ql/src/test/results/clientpositive/llap/schemeAuthority.q.out
index 9a6019c..bb2b555 100644
--- a/ql/src/test/results/clientpositive/llap/schemeAuthority.q.out
+++ b/ql/src/test/results/clientpositive/llap/schemeAuthority.q.out
@@ -27,13 +27,13 @@ POSTHOOK: type: ALTERTABLE_ADDPARTS
 #### A masked pattern was here ####
 POSTHOOK: Output: default@dynpart
 POSTHOOK: Output: default@dynpart@value=0
-#### A masked pattern was here ####
+PREHOOK: query: alter table dynPart add partition (value='1') location 'hdfs://### HDFS PATH ###'
 PREHOOK: type: ALTERTABLE_ADDPARTS
-#### A masked pattern was here ####
+PREHOOK: Input: hdfs://### HDFS PATH ###
 PREHOOK: Output: default@dynpart
-#### A masked pattern was here ####
+POSTHOOK: query: alter table dynPart add partition (value='1') location 'hdfs://### HDFS PATH ###'
 POSTHOOK: type: ALTERTABLE_ADDPARTS
-#### A masked pattern was here ####
+POSTHOOK: Input: hdfs://### HDFS PATH ###
 POSTHOOK: Output: default@dynpart
 POSTHOOK: Output: default@dynpart@value=1
 PREHOOK: query: select count(*) from dynPart
@@ -41,44 +41,44 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@dynpart
 PREHOOK: Input: default@dynpart@value=0
 PREHOOK: Input: default@dynpart@value=1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select count(*) from dynPart
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dynpart
 POSTHOOK: Input: default@dynpart@value=0
 POSTHOOK: Input: default@dynpart@value=1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 2
 PREHOOK: query: select key from dynPart
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dynpart
 PREHOOK: Input: default@dynpart@value=0
 PREHOOK: Input: default@dynpart@value=1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select key from dynPart
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dynpart
 POSTHOOK: Input: default@dynpart@value=0
 POSTHOOK: Input: default@dynpart@value=1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 10
 20
 PREHOOK: query: select key from src where (key = 10) order by key
 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) order by key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 10
 PREHOOK: query: select key from src where (key = 20) order by key
 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 = 20) order by key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 20
 #### A masked pattern was here ####

http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/llap/schemeAuthority2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schemeAuthority2.q.out b/ql/src/test/results/clientpositive/llap/schemeAuthority2.q.out
index 60913f2..cb66ead 100644
--- a/ql/src/test/results/clientpositive/llap/schemeAuthority2.q.out
+++ b/ql/src/test/results/clientpositive/llap/schemeAuthority2.q.out
@@ -27,13 +27,13 @@ POSTHOOK: type: ALTERTABLE_ADDPARTS
 #### A masked pattern was here ####
 POSTHOOK: Output: default@dynpart
 POSTHOOK: Output: default@dynpart@value=0/value2=clusterA
-#### A masked pattern was here ####
+PREHOOK: query: alter table dynPart add partition (value='0', value2='clusterB') location 'hdfs://### HDFS PATH ###'
 PREHOOK: type: ALTERTABLE_ADDPARTS
-#### A masked pattern was here ####
+PREHOOK: Input: hdfs://### HDFS PATH ###
 PREHOOK: Output: default@dynpart
-#### A masked pattern was here ####
+POSTHOOK: query: alter table dynPart add partition (value='0', value2='clusterB') location 'hdfs://### HDFS PATH ###'
 POSTHOOK: type: ALTERTABLE_ADDPARTS
-#### A masked pattern was here ####
+POSTHOOK: Input: hdfs://### HDFS PATH ###
 POSTHOOK: Output: default@dynpart
 POSTHOOK: Output: default@dynpart@value=0/value2=clusterB
 PREHOOK: query: select value2, key from dynPart where value='0'
@@ -41,13 +41,13 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@dynpart
 PREHOOK: Input: default@dynpart@value=0/value2=clusterA
 PREHOOK: Input: default@dynpart@value=0/value2=clusterB
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
 POSTHOOK: query: select value2, key from dynPart where value='0'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dynpart
 POSTHOOK: Input: default@dynpart@value=0/value2=clusterA
 POSTHOOK: Input: default@dynpart@value=0/value2=clusterB
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
 clusterA	10
 clusterB	20
 #### A masked pattern was here ####