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:10 UTC
[07/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/orc_merge1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/orc_merge1.q.out b/ql/src/test/results/clientpositive/spark/orc_merge1.q.out
index e5dd9d1..cce1e2b 100644
--- a/ql/src/test/results/clientpositive/spark/orc_merge1.q.out
+++ b/ql/src/test/results/clientpositive/spark/orc_merge1.q.out
@@ -113,7 +113,8 @@ POSTHOOK: Lineage: orcfile_merge1 PARTITION(ds=1,part=0).value SIMPLE [(src)src.
POSTHOOK: Lineage: orcfile_merge1 PARTITION(ds=1,part=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: orcfile_merge1 PARTITION(ds=1,part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
Found 2 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 738 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 1041 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: EXPLAIN
INSERT OVERWRITE TABLE orcfile_merge1b PARTITION (ds='1', part)
SELECT key, value, PMOD(HASH(key), 2) as part
@@ -164,7 +165,7 @@ STAGE PLANS:
Move Operator
files:
hdfs directory: true
-#### A masked pattern was here ####
+ destination: hdfs://### HDFS PATH ###
Stage: Stage-0
Move Operator
@@ -217,7 +218,7 @@ STAGE PLANS:
Move Operator
files:
hdfs directory: true
-#### A masked pattern was here ####
+ destination: hdfs://### HDFS PATH ###
PREHOOK: query: INSERT OVERWRITE TABLE orcfile_merge1b PARTITION (ds='1', part)
SELECT key, value, PMOD(HASH(key), 2) as part
@@ -237,7 +238,7 @@ POSTHOOK: Lineage: orcfile_merge1b PARTITION(ds=1,part=0).value SIMPLE [(src)src
POSTHOOK: Lineage: orcfile_merge1b PARTITION(ds=1,part=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: orcfile_merge1b PARTITION(ds=1,part=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 ### 1344 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: EXPLAIN
INSERT OVERWRITE TABLE orcfile_merge1c PARTITION (ds='1', part)
SELECT key, value, PMOD(HASH(key), 2) as part
@@ -288,7 +289,7 @@ STAGE PLANS:
Move Operator
files:
hdfs directory: true
-#### A masked pattern was here ####
+ destination: hdfs://### HDFS PATH ###
Stage: Stage-0
Move Operator
@@ -333,7 +334,7 @@ STAGE PLANS:
Move Operator
files:
hdfs directory: true
-#### A masked pattern was here ####
+ destination: hdfs://### HDFS PATH ###
PREHOOK: query: INSERT OVERWRITE TABLE orcfile_merge1c PARTITION (ds='1', part)
SELECT key, value, PMOD(HASH(key), 2) as part
@@ -353,7 +354,7 @@ POSTHOOK: Lineage: orcfile_merge1c PARTITION(ds=1,part=0).value SIMPLE [(src)src
POSTHOOK: Lineage: orcfile_merge1c PARTITION(ds=1,part=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: orcfile_merge1c PARTITION(ds=1,part=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 ### 1648 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: SELECT SUM(HASH(c)) FROM (
SELECT TRANSFORM(*) USING 'tr \t _' AS (c)
FROM orcfile_merge1 WHERE ds='1'
@@ -362,7 +363,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'
@@ -371,7 +372,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)
@@ -381,7 +382,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'
@@ -390,7 +391,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)
@@ -400,7 +401,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'
@@ -409,46 +410,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/spark/orc_merge2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/orc_merge2.q.out b/ql/src/test/results/clientpositive/spark/orc_merge2.q.out
index e05ba8c..2bc5ff1 100644
--- a/ql/src/test/results/clientpositive/spark/orc_merge2.q.out
+++ b/ql/src/test/results/clientpositive/spark/orc_merge2.q.out
@@ -64,7 +64,7 @@ STAGE PLANS:
Move Operator
files:
hdfs directory: true
-#### A masked pattern was here ####
+ destination: hdfs://### HDFS PATH ###
Stage: Stage-0
Move Operator
@@ -110,7 +110,7 @@ STAGE PLANS:
Move Operator
files:
hdfs directory: true
-#### A masked pattern was here ####
+ destination: hdfs://### HDFS PATH ###
PREHOOK: query: INSERT OVERWRITE TABLE orcfile_merge2a PARTITION (one='1', two, three)
SELECT key, value, PMOD(HASH(key), 10) as two,
@@ -186,7 +186,7 @@ POSTHOOK: Lineage: orcfile_merge2a PARTITION(one=1,two=9,three=1).value SIMPLE [
POSTHOOK: Lineage: orcfile_merge2a PARTITION(one=1,two=9,three=7).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: orcfile_merge2a PARTITION(one=1,two=9,three=7).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 ### 339 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: SELECT SUM(HASH(c)) FROM (
SELECT TRANSFORM(*) USING 'tr \t _' AS (c)
FROM orcfile_merge2a
@@ -213,7 +213,7 @@ PREHOOK: Input: default@orcfile_merge2a@one=1/two=8/three=0
PREHOOK: Input: default@orcfile_merge2a@one=1/two=8/three=6
PREHOOK: Input: default@orcfile_merge2a@one=1/two=9/three=1
PREHOOK: Input: default@orcfile_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 orcfile_merge2a
@@ -240,7 +240,7 @@ POSTHOOK: Input: default@orcfile_merge2a@one=1/two=8/three=0
POSTHOOK: Input: default@orcfile_merge2a@one=1/two=8/three=6
POSTHOOK: Input: default@orcfile_merge2a@one=1/two=9/three=1
POSTHOOK: Input: default@orcfile_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),
@@ -249,7 +249,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)
@@ -257,7 +257,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 orcfile_merge2a
PREHOOK: type: DROPTABLE
http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/spark/orc_merge3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/orc_merge3.q.out b/ql/src/test/results/clientpositive/spark/orc_merge3.q.out
index 2887a4b..825afc8 100644
--- a/ql/src/test/results/clientpositive/spark/orc_merge3.q.out
+++ b/ql/src/test/results/clientpositive/spark/orc_merge3.q.out
@@ -94,7 +94,7 @@ STAGE PLANS:
Move Operator
files:
hdfs directory: true
-#### A masked pattern was here ####
+ destination: hdfs://### HDFS PATH ###
Stage: Stage-0
Move Operator
@@ -136,7 +136,7 @@ STAGE PLANS:
Move Operator
files:
hdfs directory: true
-#### A masked pattern was here ####
+ destination: hdfs://### HDFS PATH ###
PREHOOK: query: INSERT OVERWRITE TABLE orcfile_merge3b
SELECT key, value FROM orcfile_merge3a
@@ -155,7 +155,7 @@ POSTHOOK: Output: default@orcfile_merge3b
POSTHOOK: Lineage: orcfile_merge3b.key SIMPLE [(orcfile_merge3a)orcfile_merge3a.FieldSchema(name:key, type:int, comment:null), ]
POSTHOOK: Lineage: orcfile_merge3b.value SIMPLE [(orcfile_merge3a)orcfile_merge3a.FieldSchema(name:value, type:string, comment:null), ]
Found 1 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 4859 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: SELECT SUM(HASH(c)) FROM (
SELECT TRANSFORM(key, value) USING 'tr \t _' AS (c)
FROM orcfile_merge3a
@@ -164,7 +164,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
@@ -173,7 +173,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)
@@ -181,14 +181,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/spark/orc_merge4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/orc_merge4.q.out b/ql/src/test/results/clientpositive/spark/orc_merge4.q.out
index fdc6012..a66bda7 100644
--- a/ql/src/test/results/clientpositive/spark/orc_merge4.q.out
+++ b/ql/src/test/results/clientpositive/spark/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
@@ -112,7 +112,7 @@ STAGE PLANS:
Move Operator
files:
hdfs directory: true
-#### A masked pattern was here ####
+ destination: hdfs://### HDFS PATH ###
Stage: Stage-0
Move Operator
@@ -162,7 +162,7 @@ STAGE PLANS:
Move Operator
files:
hdfs directory: true
-#### A masked pattern was here ####
+ destination: hdfs://### HDFS PATH ###
PREHOOK: query: INSERT OVERWRITE TABLE orcfile_merge3b
SELECT key, value FROM orcfile_merge3a
@@ -188,7 +188,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
@@ -197,7 +197,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)
@@ -205,14 +205,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/spark/orc_merge5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/orc_merge5.q.out b/ql/src/test/results/clientpositive/spark/orc_merge5.q.out
index 87a9bfe..c6f06ad 100644
--- a/ql/src/test/results/clientpositive/spark/orc_merge5.q.out
+++ b/ql/src/test/results/clientpositive/spark/orc_merge5.q.out
@@ -94,15 +94,17 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5b
POSTHOOK: Output: default@orc_merge5b
Found 3 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 649 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 0 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 601 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: select * from orc_merge5b
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_merge5b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select * from orc_merge5b
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
13 bar 80.0 2 1969-12-31 16:00:05
2 foo 0.8 1 1969-12-31 16:00:00
5 eat 0.8 6 1969-12-31 16:00:20
@@ -154,7 +156,7 @@ STAGE PLANS:
Move Operator
files:
hdfs directory: true
-#### A masked pattern was here ####
+ destination: hdfs://### HDFS PATH ###
Stage: Stage-0
Move Operator
@@ -196,7 +198,7 @@ STAGE PLANS:
Move Operator
files:
hdfs directory: true
-#### A masked pattern was here ####
+ destination: hdfs://### HDFS PATH ###
PREHOOK: query: insert overwrite table orc_merge5b select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13
PREHOOK: type: QUERY
@@ -220,15 +222,15 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5b
POSTHOOK: Output: default@orc_merge5b
Found 1 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 1022 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: select * from orc_merge5b
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_merge5b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select * from orc_merge5b
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
13 bar 80.0 2 1969-12-31 16:00:05
2 foo 0.8 1 1969-12-31 16:00:00
5 eat 0.8 6 1969-12-31 16:00:20
@@ -254,15 +256,17 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5b
POSTHOOK: Output: default@orc_merge5b
Found 3 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 649 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 0 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 601 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: select * from orc_merge5b
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_merge5b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select * from orc_merge5b
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
13 bar 80.0 2 1969-12-31 16:00:05
2 foo 0.8 1 1969-12-31 16:00:00
5 eat 0.8 6 1969-12-31 16:00:20
@@ -309,15 +313,15 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5b
POSTHOOK: Output: default@orc_merge5b
Found 1 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 1022 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: select * from orc_merge5b
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_merge5b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select * from orc_merge5b
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
13 bar 80.0 2 1969-12-31 16:00:05
2 foo 0.8 1 1969-12-31 16:00:00
5 eat 0.8 6 1969-12-31 16:00:20
http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/spark/orc_merge6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/orc_merge6.q.out b/ql/src/test/results/clientpositive/spark/orc_merge6.q.out
index b48624f..5c3b25e 100644
--- a/ql/src/test/results/clientpositive/spark/orc_merge6.q.out
+++ b/ql/src/test/results/clientpositive/spark/orc_merge6.q.out
@@ -122,9 +122,13 @@ POSTHOOK: Input: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a@year=2001/hour=24
Found 3 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 649 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 0 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 601 ### HDFS DATE ### hdfs://### HDFS PATH ###
Found 3 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 649 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 0 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 601 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: show partitions orc_merge5a
PREHOOK: type: SHOWPARTITIONS
PREHOOK: Input: default@orc_merge5a
@@ -138,13 +142,13 @@ PREHOOK: type: QUERY
PREHOOK: Input: default@orc_merge5a
PREHOOK: Input: default@orc_merge5a@year=2000/hour=24
PREHOOK: Input: default@orc_merge5a@year=2001/hour=24
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select * from orc_merge5a
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5a
POSTHOOK: Input: default@orc_merge5a@year=2000/hour=24
POSTHOOK: Input: default@orc_merge5a@year=2001/hour=24
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
13 bar 80.0 2 1969-12-31 16:00:05 2000 24
13 bar 80.0 2 1969-12-31 16:00:05 2001 24
2 foo 0.8 1 1969-12-31 16:00:00 2000 24
@@ -199,7 +203,7 @@ STAGE PLANS:
Move Operator
files:
hdfs directory: true
-#### A masked pattern was here ####
+ destination: hdfs://### HDFS PATH ###
Stage: Stage-0
Move Operator
@@ -244,7 +248,7 @@ STAGE PLANS:
Move Operator
files:
hdfs directory: true
-#### A masked pattern was here ####
+ destination: hdfs://### HDFS PATH ###
PREHOOK: query: insert overwrite table orc_merge5a partition (year="2000",hour=24) select userid,string1,subtype,decimal1,ts from orc_merge5 where userid<=13
PREHOOK: type: QUERY
@@ -293,9 +297,9 @@ POSTHOOK: Input: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a@year=2001/hour=24
Found 1 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 1022 ### HDFS DATE ### hdfs://### HDFS PATH ###
Found 1 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 1022 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: show partitions orc_merge5a
PREHOOK: type: SHOWPARTITIONS
PREHOOK: Input: default@orc_merge5a
@@ -309,13 +313,13 @@ PREHOOK: type: QUERY
PREHOOK: Input: default@orc_merge5a
PREHOOK: Input: default@orc_merge5a@year=2000/hour=24
PREHOOK: Input: default@orc_merge5a@year=2001/hour=24
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select * from orc_merge5a
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5a
POSTHOOK: Input: default@orc_merge5a@year=2000/hour=24
POSTHOOK: Input: default@orc_merge5a@year=2001/hour=24
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
13 bar 80.0 2 1969-12-31 16:00:05 2000 24
13 bar 80.0 2 1969-12-31 16:00:05 2001 24
2 foo 0.8 1 1969-12-31 16:00:00 2000 24
@@ -369,9 +373,13 @@ POSTHOOK: Input: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a@year=2001/hour=24
Found 3 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 649 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 0 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 601 ### HDFS DATE ### hdfs://### HDFS PATH ###
Found 3 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 649 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 0 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 601 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: show partitions orc_merge5a
PREHOOK: type: SHOWPARTITIONS
PREHOOK: Input: default@orc_merge5a
@@ -385,13 +393,13 @@ PREHOOK: type: QUERY
PREHOOK: Input: default@orc_merge5a
PREHOOK: Input: default@orc_merge5a@year=2000/hour=24
PREHOOK: Input: default@orc_merge5a@year=2001/hour=24
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select * from orc_merge5a
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5a
POSTHOOK: Input: default@orc_merge5a@year=2000/hour=24
POSTHOOK: Input: default@orc_merge5a@year=2001/hour=24
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
13 bar 80.0 2 1969-12-31 16:00:05 2000 24
13 bar 80.0 2 1969-12-31 16:00:05 2001 24
2 foo 0.8 1 1969-12-31 16:00:00 2000 24
@@ -464,9 +472,9 @@ POSTHOOK: Input: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a@year=2001/hour=24
Found 1 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 1022 ### HDFS DATE ### hdfs://### HDFS PATH ###
Found 1 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 1022 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: show partitions orc_merge5a
PREHOOK: type: SHOWPARTITIONS
PREHOOK: Input: default@orc_merge5a
@@ -480,13 +488,13 @@ PREHOOK: type: QUERY
PREHOOK: Input: default@orc_merge5a
PREHOOK: Input: default@orc_merge5a@year=2000/hour=24
PREHOOK: Input: default@orc_merge5a@year=2001/hour=24
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select * from orc_merge5a
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5a
POSTHOOK: Input: default@orc_merge5a@year=2000/hour=24
POSTHOOK: Input: default@orc_merge5a@year=2001/hour=24
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
13 bar 80.0 2 1969-12-31 16:00:05 2000 24
13 bar 80.0 2 1969-12-31 16:00:05 2001 24
2 foo 0.8 1 1969-12-31 16:00:00 2000 24
http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/spark/orc_merge7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/orc_merge7.q.out b/ql/src/test/results/clientpositive/spark/orc_merge7.q.out
index 174a07b..131ddce 100644
--- a/ql/src/test/results/clientpositive/spark/orc_merge7.q.out
+++ b/ql/src/test/results/clientpositive/spark/orc_merge7.q.out
@@ -153,9 +153,10 @@ POSTHOOK: Input: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a@st=0.8
Found 1 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 596 ### HDFS DATE ### hdfs://### HDFS PATH ###
Found 2 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 601 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 601 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: show partitions orc_merge5a
PREHOOK: type: SHOWPARTITIONS
PREHOOK: Input: default@orc_merge5a
@@ -173,7 +174,7 @@ PREHOOK: Input: default@orc_merge5a@st=0.8
PREHOOK: Input: default@orc_merge5a@st=1.8
PREHOOK: Input: default@orc_merge5a@st=8.0
PREHOOK: Input: default@orc_merge5a@st=80.0
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select * from orc_merge5a where userid<=13
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5a
@@ -181,7 +182,7 @@ POSTHOOK: Input: default@orc_merge5a@st=0.8
POSTHOOK: Input: default@orc_merge5a@st=1.8
POSTHOOK: Input: default@orc_merge5a@st=8.0
POSTHOOK: Input: default@orc_merge5a@st=80.0
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
13 bar 80.0 2 1969-12-31 16:00:05 80.0
2 foo 0.8 1 1969-12-31 16:00:00 0.8
5 eat 0.8 6 1969-12-31 16:00:20 0.8
@@ -229,7 +230,7 @@ STAGE PLANS:
Move Operator
files:
hdfs directory: true
-#### A masked pattern was here ####
+ destination: hdfs://### HDFS PATH ###
Stage: Stage-0
Move Operator
@@ -273,7 +274,7 @@ STAGE PLANS:
Move Operator
files:
hdfs directory: true
-#### A masked pattern was here ####
+ destination: hdfs://### HDFS PATH ###
PREHOOK: query: insert overwrite table orc_merge5a partition (st) select userid,string1,subtype,decimal1,ts,subtype from orc_merge5
PREHOOK: type: QUERY
@@ -358,9 +359,9 @@ POSTHOOK: Input: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a@st=0.8
Found 1 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 596 ### HDFS DATE ### hdfs://### HDFS PATH ###
Found 1 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 948 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: show partitions orc_merge5a
PREHOOK: type: SHOWPARTITIONS
PREHOOK: Input: default@orc_merge5a
@@ -378,7 +379,7 @@ PREHOOK: Input: default@orc_merge5a@st=0.8
PREHOOK: Input: default@orc_merge5a@st=1.8
PREHOOK: Input: default@orc_merge5a@st=8.0
PREHOOK: Input: default@orc_merge5a@st=80.0
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select * from orc_merge5a where userid<=13
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5a
@@ -386,7 +387,7 @@ POSTHOOK: Input: default@orc_merge5a@st=0.8
POSTHOOK: Input: default@orc_merge5a@st=1.8
POSTHOOK: Input: default@orc_merge5a@st=8.0
POSTHOOK: Input: default@orc_merge5a@st=80.0
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
13 bar 80.0 2 1969-12-31 16:00:05 80.0
2 foo 0.8 1 1969-12-31 16:00:00 0.8
5 eat 0.8 6 1969-12-31 16:00:20 0.8
@@ -473,9 +474,10 @@ POSTHOOK: Input: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a@st=0.8
Found 1 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 596 ### HDFS DATE ### hdfs://### HDFS PATH ###
Found 2 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 601 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 601 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: show partitions orc_merge5a
PREHOOK: type: SHOWPARTITIONS
PREHOOK: Input: default@orc_merge5a
@@ -493,7 +495,7 @@ PREHOOK: Input: default@orc_merge5a@st=0.8
PREHOOK: Input: default@orc_merge5a@st=1.8
PREHOOK: Input: default@orc_merge5a@st=8.0
PREHOOK: Input: default@orc_merge5a@st=80.0
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select * from orc_merge5a where userid<=13
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5a
@@ -501,7 +503,7 @@ POSTHOOK: Input: default@orc_merge5a@st=0.8
POSTHOOK: Input: default@orc_merge5a@st=1.8
POSTHOOK: Input: default@orc_merge5a@st=8.0
POSTHOOK: Input: default@orc_merge5a@st=80.0
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
13 bar 80.0 2 1969-12-31 16:00:05 80.0
2 foo 0.8 1 1969-12-31 16:00:00 0.8
5 eat 0.8 6 1969-12-31 16:00:20 0.8
@@ -570,9 +572,9 @@ POSTHOOK: Input: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a@st=0.8
Found 1 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 596 ### HDFS DATE ### hdfs://### HDFS PATH ###
Found 1 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 948 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: show partitions orc_merge5a
PREHOOK: type: SHOWPARTITIONS
PREHOOK: Input: default@orc_merge5a
@@ -590,7 +592,7 @@ PREHOOK: Input: default@orc_merge5a@st=0.8
PREHOOK: Input: default@orc_merge5a@st=1.8
PREHOOK: Input: default@orc_merge5a@st=8.0
PREHOOK: Input: default@orc_merge5a@st=80.0
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select * from orc_merge5a where userid<=13
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5a
@@ -598,7 +600,7 @@ POSTHOOK: Input: default@orc_merge5a@st=0.8
POSTHOOK: Input: default@orc_merge5a@st=1.8
POSTHOOK: Input: default@orc_merge5a@st=8.0
POSTHOOK: Input: default@orc_merge5a@st=80.0
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
13 bar 80.0 2 1969-12-31 16:00:05 80.0
2 foo 0.8 1 1969-12-31 16:00:00 0.8
5 eat 0.8 6 1969-12-31 16:00:20 0.8
http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/spark/orc_merge8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/orc_merge8.q.out b/ql/src/test/results/clientpositive/spark/orc_merge8.q.out
index 3be3b07..6d171d2 100644
--- a/ql/src/test/results/clientpositive/spark/orc_merge8.q.out
+++ b/ql/src/test/results/clientpositive/spark/orc_merge8.q.out
@@ -117,7 +117,10 @@ POSTHOOK: Lineage: alltypes_orc.ti SIMPLE [(alltypes)alltypes.FieldSchema(name:t
POSTHOOK: Lineage: alltypes_orc.ts SIMPLE [(alltypes)alltypes.FieldSchema(name:ts, type:timestamp, comment:null), ]
POSTHOOK: Lineage: alltypes_orc.vc SIMPLE [(alltypes)alltypes.FieldSchema(name:vc, type:varchar(5), comment:null), ]
Found 4 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 1595 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 1595 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 1606 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 1606 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: alter table alltypes_orc concatenate
PREHOOK: type: ALTER_TABLE_MERGE
PREHOOK: Input: default@alltypes_orc
@@ -127,4 +130,4 @@ POSTHOOK: type: ALTER_TABLE_MERGE
POSTHOOK: Input: default@alltypes_orc
POSTHOOK: Output: default@alltypes_orc
Found 1 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 4634 ### HDFS DATE ### hdfs://### HDFS PATH ###
http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/spark/orc_merge9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/orc_merge9.q.out b/ql/src/test/results/clientpositive/spark/orc_merge9.q.out
index 28e51b2..e5db512 100644
--- a/ql/src/test/results/clientpositive/spark/orc_merge9.q.out
+++ b/ql/src/test/results/clientpositive/spark/orc_merge9.q.out
@@ -35,15 +35,16 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@ts_merge
Found 2 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 246402 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 246402 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: select count(*) from ts_merge
PREHOOK: type: QUERY
PREHOOK: Input: default@ts_merge
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select count(*) from ts_merge
POSTHOOK: type: QUERY
POSTHOOK: Input: default@ts_merge
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
50000
PREHOOK: query: alter table ts_merge concatenate
PREHOOK: type: ALTER_TABLE_MERGE
@@ -56,14 +57,14 @@ POSTHOOK: Output: default@ts_merge
PREHOOK: query: select count(*) from ts_merge
PREHOOK: type: QUERY
PREHOOK: Input: default@ts_merge
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select count(*) from ts_merge
POSTHOOK: type: QUERY
POSTHOOK: Input: default@ts_merge
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
50000
Found 1 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 457162 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: create table a_merge like alltypesorc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -101,15 +102,16 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@a_merge
Found 2 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 295616 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 377237 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: select count(*) from a_merge
PREHOOK: type: QUERY
PREHOOK: Input: default@a_merge
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select count(*) from a_merge
POSTHOOK: type: QUERY
POSTHOOK: Input: default@a_merge
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
24576
PREHOOK: query: alter table a_merge concatenate
PREHOOK: type: ALTER_TABLE_MERGE
@@ -122,14 +124,15 @@ POSTHOOK: Output: default@a_merge
PREHOOK: query: select count(*) from a_merge
PREHOOK: type: QUERY
PREHOOK: Input: default@a_merge
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select count(*) from a_merge
POSTHOOK: type: QUERY
POSTHOOK: Input: default@a_merge
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
24576
Found 2 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 295616 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 377237 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: insert into table a_merge select * from alltypesorc
PREHOOK: type: QUERY
PREHOOK: Input: default@alltypesorc
@@ -151,15 +154,17 @@ POSTHOOK: Lineage: a_merge.ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSch
POSTHOOK: Lineage: a_merge.ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:null), ]
POSTHOOK: Lineage: a_merge.ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:null), ]
Found 3 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 295616 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 377237 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 295616 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: select count(*) from a_merge
PREHOOK: type: QUERY
PREHOOK: Input: default@a_merge
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select count(*) from a_merge
POSTHOOK: type: QUERY
POSTHOOK: Input: default@a_merge
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
36864
PREHOOK: query: alter table a_merge concatenate
PREHOOK: type: ALTER_TABLE_MERGE
@@ -172,11 +177,12 @@ POSTHOOK: Output: default@a_merge
PREHOOK: query: select count(*) from a_merge
PREHOOK: type: QUERY
PREHOOK: Input: default@a_merge
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select count(*) from a_merge
POSTHOOK: type: QUERY
POSTHOOK: Input: default@a_merge
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
36864
Found 2 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 590506 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 377237 ### HDFS DATE ### hdfs://### HDFS PATH ###
http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/spark/orc_merge_diff_fs.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/orc_merge_diff_fs.q.out b/ql/src/test/results/clientpositive/spark/orc_merge_diff_fs.q.out
index e5dd9d1..7439096 100644
--- a/ql/src/test/results/clientpositive/spark/orc_merge_diff_fs.q.out
+++ b/ql/src/test/results/clientpositive/spark/orc_merge_diff_fs.q.out
@@ -362,7 +362,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'
@@ -371,7 +371,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)
@@ -381,7 +381,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'
@@ -390,7 +390,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)
@@ -400,7 +400,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'
@@ -409,46 +409,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/spark/orc_merge_incompat1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/orc_merge_incompat1.q.out b/ql/src/test/results/clientpositive/spark/orc_merge_incompat1.q.out
index d8e2308..d97ac66 100644
--- a/ql/src/test/results/clientpositive/spark/orc_merge_incompat1.q.out
+++ b/ql/src/test/results/clientpositive/spark/orc_merge_incompat1.q.out
@@ -158,15 +158,20 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5b
POSTHOOK: Output: default@orc_merge5b
Found 6 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 657 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 657 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 657 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 668 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 668 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 668 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: select * from orc_merge5b
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_merge5b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select * from orc_merge5b
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
13 bar 80.0 2 1969-12-31 16:00:05
13 bar 80.0 2 1969-12-31 16:00:05
13 bar 80.0 2 1969-12-31 16:00:05
@@ -202,15 +207,18 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5b
POSTHOOK: Output: default@orc_merge5b
Found 4 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 1329 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 668 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 668 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 668 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: select * from orc_merge5b
PREHOOK: type: QUERY
PREHOOK: Input: default@orc_merge5b
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select * from orc_merge5b
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5b
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
13 bar 80.0 2 1969-12-31 16:00:05
13 bar 80.0 2 1969-12-31 16:00:05
13 bar 80.0 2 1969-12-31 16:00:05
http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/spark/orc_merge_incompat2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/orc_merge_incompat2.q.out b/ql/src/test/results/clientpositive/spark/orc_merge_incompat2.q.out
index 9398dc2..b0db735 100644
--- a/ql/src/test/results/clientpositive/spark/orc_merge_incompat2.q.out
+++ b/ql/src/test/results/clientpositive/spark/orc_merge_incompat2.q.out
@@ -215,9 +215,15 @@ POSTHOOK: Input: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a@st=0.8
Found 4 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 595 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 595 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 595 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 595 ### HDFS DATE ### hdfs://### HDFS PATH ###
Found 4 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 633 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 633 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 633 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 633 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: show partitions orc_merge5a
PREHOOK: type: SHOWPARTITIONS
PREHOOK: Input: default@orc_merge5a
@@ -235,7 +241,7 @@ PREHOOK: Input: default@orc_merge5a@st=0.8
PREHOOK: Input: default@orc_merge5a@st=1.8
PREHOOK: Input: default@orc_merge5a@st=8.0
PREHOOK: Input: default@orc_merge5a@st=80.0
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select * from orc_merge5a where userid<=13
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5a
@@ -243,7 +249,7 @@ POSTHOOK: Input: default@orc_merge5a@st=0.8
POSTHOOK: Input: default@orc_merge5a@st=1.8
POSTHOOK: Input: default@orc_merge5a@st=8.0
POSTHOOK: Input: default@orc_merge5a@st=80.0
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
13 bar 80.0 2 1969-12-31 16:00:05 80.0
13 bar 80.0 2 1969-12-31 16:00:05 80.0
13 bar 80.0 2 1969-12-31 16:00:05 80.0
@@ -321,9 +327,13 @@ POSTHOOK: Input: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a
POSTHOOK: Output: default@orc_merge5a@st=0.8
Found 3 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 899 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 595 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 595 ### HDFS DATE ### hdfs://### HDFS PATH ###
Found 3 items
-#### A masked pattern was here ####
+-rw-r--r-- 3 ### USER ### ### GROUP ### 954 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 633 ### HDFS DATE ### hdfs://### HDFS PATH ###
+-rw-r--r-- 3 ### USER ### ### GROUP ### 633 ### HDFS DATE ### hdfs://### HDFS PATH ###
PREHOOK: query: show partitions orc_merge5a
PREHOOK: type: SHOWPARTITIONS
PREHOOK: Input: default@orc_merge5a
@@ -341,7 +351,7 @@ PREHOOK: Input: default@orc_merge5a@st=0.8
PREHOOK: Input: default@orc_merge5a@st=1.8
PREHOOK: Input: default@orc_merge5a@st=8.0
PREHOOK: Input: default@orc_merge5a@st=80.0
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select * from orc_merge5a where userid<=13
POSTHOOK: type: QUERY
POSTHOOK: Input: default@orc_merge5a
@@ -349,7 +359,7 @@ POSTHOOK: Input: default@orc_merge5a@st=0.8
POSTHOOK: Input: default@orc_merge5a@st=1.8
POSTHOOK: Input: default@orc_merge5a@st=8.0
POSTHOOK: Input: default@orc_merge5a@st=80.0
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
13 bar 80.0 2 1969-12-31 16:00:05 80.0
13 bar 80.0 2 1969-12-31 16:00:05 80.0
13 bar 80.0 2 1969-12-31 16:00:05 80.0
http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/spark/parallel_orderby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/parallel_orderby.q.out b/ql/src/test/results/clientpositive/spark/parallel_orderby.q.out
index 836fa0f..8e9d2bb 100644
--- a/ql/src/test/results/clientpositive/spark/parallel_orderby.q.out
+++ b/ql/src/test/results/clientpositive/spark/parallel_orderby.q.out
@@ -73,7 +73,7 @@ STAGE PLANS:
Move Operator
files:
hdfs directory: true
-#### A masked pattern was here ####
+ destination: hdfs://### HDFS PATH ###
Stage: Stage-3
Create Table Operator:
@@ -137,11 +137,11 @@ Storage Desc Params:
PREHOOK: query: select * from total_ordered
PREHOOK: type: QUERY
PREHOOK: Input: default@total_ordered
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select * from total_ordered
POSTHOOK: type: QUERY
POSTHOOK: Input: default@total_ordered
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
128 val_128
128 val_128
150 val_150
@@ -247,11 +247,11 @@ Storage Desc Params:
PREHOOK: query: select * from total_ordered
PREHOOK: type: QUERY
PREHOOK: Input: default@total_ordered
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select * from total_ordered
POSTHOOK: type: QUERY
POSTHOOK: Input: default@total_ordered
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
128 val_128
128 val_128
150 val_150
http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/spark/quotedid_smb.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/quotedid_smb.q.out b/ql/src/test/results/clientpositive/spark/quotedid_smb.q.out
index 8b37d2a..c8b2e46 100644
--- a/ql/src/test/results/clientpositive/spark/quotedid_smb.q.out
+++ b/ql/src/test/results/clientpositive/spark/quotedid_smb.q.out
@@ -99,14 +99,14 @@ where a.`x+1` < '11'
PREHOOK: type: QUERY
PREHOOK: Input: default@src_b
PREHOOK: Input: default@src_b2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select a.`x+1`, a.`!@#$%^&*()_q`, b.`x+1`, b.`!@#$%^&*()_q`
from src_b a join src_b2 b on a.`!@#$%^&*()_q` = b.`!@#$%^&*()_q`
where a.`x+1` < '11'
POSTHOOK: type: QUERY
POSTHOOK: Input: default@src_b
POSTHOOK: Input: default@src_b2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
0 val_0 0 val_0
0 val_0 0 val_0
0 val_0 0 val_0
http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/spark/reduce_deduplicate.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/reduce_deduplicate.q.out b/ql/src/test/results/clientpositive/spark/reduce_deduplicate.q.out
index bcf09d8..4475c6e 100644
--- a/ql/src/test/results/clientpositive/spark/reduce_deduplicate.q.out
+++ b/ql/src/test/results/clientpositive/spark/reduce_deduplicate.q.out
@@ -46,9 +46,9 @@ STAGE PLANS:
value expressions: _col1 (type: string)
auto parallelism: false
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
@@ -61,6 +61,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
@@ -82,6 +83,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
@@ -106,10 +108,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: 5312 Basic stats: COMPLETE Column stats: NONE
-#### 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
@@ -122,6 +124,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
@@ -141,7 +144,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
@@ -154,6 +157,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
@@ -169,7 +173,7 @@ STAGE PLANS:
Stage: Stage-2
Stats Work
Basic Stats Work:
-#### A masked pattern was here ####
+ Stats Aggregation Key Prefix: hdfs://### HDFS PATH ###
PREHOOK: query: insert overwrite table bucket5_1
select * from src cluster by key
@@ -186,20 +190,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
@@ -320,11 +324,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: 0 Basic stats: PARTIAL Column stats: NONE
-#### A masked pattern was here ####
+ Stats Publishing Key Prefix: hdfs://### HDFS PATH ###
table:
input format: org.apache.hadoop.mapred.TextInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -335,6 +339,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
@@ -354,7 +359,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
@@ -365,6 +370,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
@@ -378,5 +384,5 @@ STAGE PLANS:
Stage: Stage-2
Stats Work
Basic Stats Work:
-#### A masked pattern was here ####
+ Stats Aggregation Key Prefix: hdfs://### HDFS PATH ###
http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/spark/remote_script.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/remote_script.q.out b/ql/src/test/results/clientpositive/spark/remote_script.q.out
index 87531f0..315c5c5 100644
--- a/ql/src/test/results/clientpositive/spark/remote_script.q.out
+++ b/ql/src/test/results/clientpositive/spark/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/spark/root_dir_external_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/root_dir_external_table.q.out b/ql/src/test/results/clientpositive/spark/root_dir_external_table.q.out
index 238a409..7ba2b5b 100644
--- a/ql/src/test/results/clientpositive/spark/root_dir_external_table.q.out
+++ b/ql/src/test/results/clientpositive/spark/root_dir_external_table.q.out
@@ -1,26 +1,28 @@
-#### A masked pattern was here ####
+PREHOOK: query: insert overwrite directory "hdfs://### HDFS PATH ###" select key from src where (key < 20) order by key
PREHOOK: type: QUERY
PREHOOK: Input: default@src
#### A masked pattern was here ####
+POSTHOOK: query: insert overwrite directory "hdfs://### HDFS PATH ###" select key from src where (key < 20) order by key
POSTHOOK: type: QUERY
POSTHOOK: Input: default@src
#### A masked pattern was here ####
+PREHOOK: query: create external table roottable (key string) row format delimited fields terminated by '\\t' stored as textfile location 'hdfs:///'
PREHOOK: type: CREATETABLE
-#### A masked pattern was here ####
+PREHOOK: Input: hdfs://### HDFS PATH ###
PREHOOK: Output: database:default
PREHOOK: Output: default@roottable
-#### A masked pattern was here ####
+POSTHOOK: query: create external table roottable (key string) row format delimited fields terminated by '\\t' stored as textfile location 'hdfs://### HDFS PATH ###'
POSTHOOK: type: CREATETABLE
-#### A masked pattern was here ####
+POSTHOOK: Input: hdfs://### HDFS PATH ###
POSTHOOK: Output: database:default
POSTHOOK: Output: default@roottable
PREHOOK: query: select count(*) from roottable
PREHOOK: type: QUERY
PREHOOK: Input: default@roottable
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: select count(*) from roottable
POSTHOOK: type: QUERY
POSTHOOK: Input: default@roottable
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
20
#### A masked pattern was here ####
http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/spark/schemeAuthority.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/schemeAuthority.q.out b/ql/src/test/results/clientpositive/spark/schemeAuthority.q.out
index 9a6019c..bb2b555 100644
--- a/ql/src/test/results/clientpositive/spark/schemeAuthority.q.out
+++ b/ql/src/test/results/clientpositive/spark/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/spark/schemeAuthority2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/schemeAuthority2.q.out b/ql/src/test/results/clientpositive/spark/schemeAuthority2.q.out
index 60913f2..cb66ead 100644
--- a/ql/src/test/results/clientpositive/spark/schemeAuthority2.q.out
+++ b/ql/src/test/results/clientpositive/spark/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 ####
http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/spark/scriptfile1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/scriptfile1.q.out b/ql/src/test/results/clientpositive/spark/scriptfile1.q.out
index cf718cc..f105cf4 100644
--- a/ql/src/test/results/clientpositive/spark/scriptfile1.q.out
+++ b/ql/src/test/results/clientpositive/spark/scriptfile1.q.out
@@ -31,11 +31,11 @@ POSTHOOK: Lineage: dest1.value SCRIPT [(src)src.FieldSchema(name:key, type:strin
PREHOOK: query: SELECT dest1.* FROM dest1
PREHOOK: type: QUERY
PREHOOK: Input: default@dest1
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: SELECT dest1.* FROM dest1
POSTHOOK: type: QUERY
POSTHOOK: Input: default@dest1
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
10 val_10
100 val_100
100 val_100
http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/spark/scriptfile1.q.out_spark
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/scriptfile1.q.out_spark b/ql/src/test/results/clientpositive/spark/scriptfile1.q.out_spark
new file mode 100644
index 0000000..cf718cc
--- /dev/null
+++ b/ql/src/test/results/clientpositive/spark/scriptfile1.q.out_spark
@@ -0,0 +1,47 @@
+PREHOOK: query: CREATE TABLE dest1(key INT, value STRING)
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@dest1
+POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@dest1
+PREHOOK: query: FROM (
+ FROM src
+ SELECT TRANSFORM(src.key, src.value)
+ USING 'testgrep' AS (tkey, tvalue)
+ CLUSTER BY tkey
+) tmap
+INSERT OVERWRITE TABLE dest1 SELECT tmap.tkey, tmap.tvalue
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1
+POSTHOOK: query: FROM (
+ FROM src
+ SELECT TRANSFORM(src.key, src.value)
+ USING 'testgrep' AS (tkey, tvalue)
+ CLUSTER BY tkey
+) tmap
+INSERT OVERWRITE TABLE dest1 SELECT tmap.tkey, tmap.tvalue
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1
+POSTHOOK: Lineage: dest1.key SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ]
+POSTHOOK: Lineage: dest1.value SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ]
+PREHOOK: query: SELECT dest1.* FROM dest1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@dest1
+#### A masked pattern was here ####
+POSTHOOK: query: SELECT dest1.* FROM dest1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dest1
+#### A masked pattern was here ####
+10 val_10
+100 val_100
+100 val_100
+103 val_103
+103 val_103
+104 val_104
+104 val_104
+105 val_105
+310 val_310
http://git-wip-us.apache.org/repos/asf/hive/blob/42527189/ql/src/test/results/clientpositive/spark/spark_combine_equivalent_work.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/spark_combine_equivalent_work.q.out b/ql/src/test/results/clientpositive/spark/spark_combine_equivalent_work.q.out
index 415b370..37e3f9c 100644
--- a/ql/src/test/results/clientpositive/spark/spark_combine_equivalent_work.q.out
+++ b/ql/src/test/results/clientpositive/spark/spark_combine_equivalent_work.q.out
@@ -52,7 +52,7 @@ PREHOOK: Input: default@a1
PREHOOK: Input: default@a1@end_dt=20161020
PREHOOK: Input: default@a1@end_dt=20161021
PREHOOK: Input: default@a2
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: SELECT T1.KEHHAO,COUNT(1) FROM (
SELECT KEHHAO FROM a1 T
WHERE T.KEHHAO = '2000721360' AND '20161018' BETWEEN T.START_DT AND T.END_DT-1
@@ -67,7 +67,7 @@ POSTHOOK: Input: default@a1
POSTHOOK: Input: default@a1@end_dt=20161020
POSTHOOK: Input: default@a1@end_dt=20161021
POSTHOOK: Input: default@a2
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: SELECT T1.KEHHAO,COUNT(1) FROM (
SELECT KEHHAO FROM a1 T
WHERE T.KEHHAO = '2000721360' AND '20161018' BETWEEN T.START_DT AND T.END_DT-1
@@ -81,7 +81,7 @@ PREHOOK: type: QUERY
PREHOOK: Input: default@a1
PREHOOK: Input: default@a1@end_dt=20161020
PREHOOK: Input: default@a1@end_dt=20161021
-#### A masked pattern was here ####
+PREHOOK: Output: hdfs://### HDFS PATH ###
POSTHOOK: query: SELECT T1.KEHHAO,COUNT(1) FROM (
SELECT KEHHAO FROM a1 T
WHERE T.KEHHAO = '2000721360' AND '20161018' BETWEEN T.START_DT AND T.END_DT-1
@@ -95,7 +95,7 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@a1
POSTHOOK: Input: default@a1@end_dt=20161020
POSTHOOK: Input: default@a1@end_dt=20161021
-#### A masked pattern was here ####
+POSTHOOK: Output: hdfs://### HDFS PATH ###
2000721360 2
PREHOOK: query: DROP TABLE a1
PREHOOK: type: DROPTABLE