hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xu...@apache.org
Subject svn commit: r1653196 [2/3] - in /hive/trunk/ql/src/test: queries/clientpositive/ results/clientpositive/ results/clientpositive/spark/ results/clientpositive/tez/
Date Tue, 20 Jan 2015 05:43:53 GMT
Modified: hive/trunk/ql/src/test/results/clientpositive/semijoin.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/semijoin.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/semijoin.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/semijoin.q.out Tue Jan 20 05:43:52 2015
@@ -1,9 +1,13 @@
-PREHOOK: query: create table t1 as select cast(key as int) key, value from src where key <= 10
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+create table t1 as select cast(key as int) key, value from src where key <= 10
 PREHOOK: type: CREATETABLE_AS_SELECT
 PREHOOK: Input: default@src
 PREHOOK: Output: database:default
 PREHOOK: Output: default@t1
-POSTHOOK: query: create table t1 as select cast(key as int) key, value from src where key <= 10
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+create table t1 as select cast(key as int) key, value from src where key <= 10
 POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@src
 POSTHOOK: Output: database:default
@@ -19,6 +23,7 @@ POSTHOOK: Input: default@t1
 0	val_0
 0	val_0
 0	val_0
+10	val_10
 2	val_2
 4	val_4
 5	val_5
@@ -26,7 +31,6 @@ POSTHOOK: Input: default@t1
 5	val_5
 8	val_8
 9	val_9
-10	val_10
 PREHOOK: query: create table t2 as select cast(2*key as int) key, value from t1
 PREHOOK: type: CREATETABLE_AS_SELECT
 PREHOOK: Input: default@t1
@@ -48,14 +52,14 @@ POSTHOOK: Input: default@t2
 0	val_0
 0	val_0
 0	val_0
-4	val_2
-8	val_4
 10	val_5
 10	val_5
 10	val_5
 16	val_8
 18	val_9
 20	val_10
+4	val_2
+8	val_4
 PREHOOK: query: create table t3 as select * from (select * from t1 union all select * from t2) b
 PREHOOK: type: CREATETABLE_AS_SELECT
 PREHOOK: Input: default@t1
@@ -82,7 +86,14 @@ POSTHOOK: Input: default@t3
 0	val_0
 0	val_0
 0	val_0
+10	val_10
+10	val_5
+10	val_5
+10	val_5
+16	val_8
+18	val_9
 2	val_2
+20	val_10
 4	val_2
 4	val_4
 5	val_5
@@ -91,13 +102,6 @@ POSTHOOK: Input: default@t3
 8	val_4
 8	val_8
 9	val_9
-10	val_10
-10	val_5
-10	val_5
-10	val_5
-16	val_8
-18	val_9
-20	val_10
 PREHOOK: query: create table t4 (key int, value string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
@@ -215,9 +219,9 @@ POSTHOOK: Input: default@t2
 0	val_0
 0	val_0
 0	val_0
+10	val_10
 4	val_4
 8	val_8
-10	val_10
 PREHOOK: query: explain select * from t2 a left semi join t1 b on b.key=a.key sort by a.key, a.value
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from t2 a left semi join t1 b on b.key=a.key sort by a.key, a.value
@@ -319,11 +323,11 @@ POSTHOOK: Input: default@t2
 0	val_0
 0	val_0
 0	val_0
-4	val_2
-8	val_4
 10	val_5
 10	val_5
 10	val_5
+4	val_2
+8	val_4
 PREHOOK: query: explain select * from t1 a left semi join t4 b on b.key=a.key sort by a.key, a.value
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from t1 a left semi join t4 b on b.key=a.key sort by a.key, a.value
@@ -937,11 +941,11 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@t1
 POSTHOOK: Input: default@t2
 #### A masked pattern was here ####
-4	val_2
-8	val_4
 10	val_5
 10	val_5
 10	val_5
+4	val_2
+8	val_4
 PREHOOK: query: explain select /*+ mapjoin(b) */ a.key from t3 a left semi join t1 b on a.key = b.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select /*+ mapjoin(b) */ a.key from t3 a left semi join t1 b on a.key = b.key sort by a.key
@@ -1038,6 +1042,10 @@ POSTHOOK: Input: default@t3
 0
 0
 0
+10
+10
+10
+10
 2
 4
 4
@@ -1047,10 +1055,6 @@ POSTHOOK: Input: default@t3
 8
 8
 9
-10
-10
-10
-10
 PREHOOK: query: explain select * from t1 a left semi join t2 b on a.key = 2*b.key sort by a.key, a.value
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from t1 a left semi join t2 b on a.key = 2*b.key sort by a.key, a.value
@@ -1281,11 +1285,11 @@ POSTHOOK: Input: default@t3
 0	val_0	0	val_0
 0	val_0	0	val_0
 0	val_0	0	val_0
-4	val_4	4	val_2
-8	val_8	8	val_4
 10	val_10	10	val_5
 10	val_10	10	val_5
 10	val_10	10	val_5
+4	val_4	4	val_2
+8	val_8	8	val_4
 PREHOOK: query: explain select * from t3 a left semi join t1 b on a.key = b.key and a.value=b.value sort by a.key, a.value
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from t3 a left semi join t1 b on a.key = b.key and a.value=b.value sort by a.key, a.value
@@ -1389,6 +1393,7 @@ POSTHOOK: Input: default@t3
 0	val_0
 0	val_0
 0	val_0
+10	val_10
 2	val_2
 4	val_4
 5	val_5
@@ -1396,7 +1401,6 @@ POSTHOOK: Input: default@t3
 5	val_5
 8	val_8
 9	val_9
-10	val_10
 PREHOOK: query: explain select /*+ mapjoin(b, c) */ a.key from t3 a left semi join t1 b on a.key = b.key left semi join t2 c on a.key = c.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select /*+ mapjoin(b, c) */ a.key from t3 a left semi join t1 b on a.key = b.key left semi join t2 c on a.key = c.key sort by a.key
@@ -1522,14 +1526,14 @@ POSTHOOK: Input: default@t3
 0
 0
 0
-4
-4
-8
-8
 10
 10
 10
 10
+4
+4
+8
+8
 PREHOOK: query: explain select a.key from t3 a left outer join t1 b on a.key = b.key left semi join t2 c on b.key = c.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t3 a left outer join t1 b on a.key = b.key left semi join t2 c on b.key = c.key sort by a.key
@@ -1651,14 +1655,14 @@ POSTHOOK: Input: default@t3
 0
 0
 0
-4
-4
-8
-8
 10
 10
 10
 10
+4
+4
+8
+8
 PREHOOK: query: explain select a.key from t1 a right outer join t3 b on a.key = b.key left semi join t2 c on b.key = c.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t1 a right outer join t3 b on a.key = b.key left semi join t2 c on b.key = c.key sort by a.key
@@ -1762,9 +1766,6 @@ POSTHOOK: Input: default@t1
 POSTHOOK: Input: default@t2
 POSTHOOK: Input: default@t3
 #### A masked pattern was here ####
-NULL
-NULL
-NULL
 0
 0
 0
@@ -1783,14 +1784,17 @@ NULL
 0
 0
 0
-4
-4
-8
-8
 10
 10
 10
 10
+4
+4
+8
+8
+NULL
+NULL
+NULL
 PREHOOK: query: explain select a.key from t1 a full outer join t3 b on a.key = b.key left semi join t2 c on b.key = c.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t1 a full outer join t3 b on a.key = b.key left semi join t2 c on b.key = c.key sort by a.key
@@ -1894,9 +1898,6 @@ POSTHOOK: Input: default@t1
 POSTHOOK: Input: default@t2
 POSTHOOK: Input: default@t3
 #### A masked pattern was here ####
-NULL
-NULL
-NULL
 0
 0
 0
@@ -1915,14 +1916,17 @@ NULL
 0
 0
 0
-4
-4
-8
-8
 10
 10
 10
 10
+4
+4
+8
+8
+NULL
+NULL
+NULL
 PREHOOK: query: explain select a.key from t3 a left semi join t2 b on a.key = b.key left outer join t1 c on a.key = c.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t3 a left semi join t2 b on a.key = b.key left outer join t1 c on a.key = c.key sort by a.key
@@ -2044,10 +2048,6 @@ POSTHOOK: Input: default@t3
 0
 0
 0
-4
-4
-8
-8
 10
 10
 10
@@ -2055,6 +2055,10 @@ POSTHOOK: Input: default@t3
 16
 18
 20
+4
+4
+8
+8
 PREHOOK: query: explain select a.key from t3 a left semi join t2 b on a.key = b.key right outer join t1 c on a.key = c.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t3 a left semi join t2 b on a.key = b.key right outer join t1 c on a.key = c.key sort by a.key
@@ -2158,11 +2162,6 @@ POSTHOOK: Input: default@t1
 POSTHOOK: Input: default@t2
 POSTHOOK: Input: default@t3
 #### A masked pattern was here ####
-NULL
-NULL
-NULL
-NULL
-NULL
 0
 0
 0
@@ -2181,14 +2180,19 @@ NULL
 0
 0
 0
-4
-4
-8
-8
 10
 10
 10
 10
+4
+4
+8
+8
+NULL
+NULL
+NULL
+NULL
+NULL
 PREHOOK: query: explain select a.key from t3 a left semi join t1 b on a.key = b.key full outer join t2 c on a.key = c.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t3 a left semi join t1 b on a.key = b.key full outer join t2 c on a.key = c.key sort by a.key
@@ -2292,9 +2296,6 @@ POSTHOOK: Input: default@t1
 POSTHOOK: Input: default@t2
 POSTHOOK: Input: default@t3
 #### A masked pattern was here ####
-NULL
-NULL
-NULL
 0
 0
 0
@@ -2313,15 +2314,6 @@ NULL
 0
 0
 0
-2
-4
-4
-5
-5
-5
-8
-8
-9
 10
 10
 10
@@ -2334,6 +2326,18 @@ NULL
 10
 10
 10
+2
+4
+4
+5
+5
+5
+8
+8
+9
+NULL
+NULL
+NULL
 PREHOOK: query: explain select a.key from t3 a left semi join t2 b on a.key = b.key left outer join t1 c on a.value = c.value sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t3 a left semi join t2 b on a.key = b.key left outer join t1 c on a.value = c.value sort by a.key
@@ -2487,10 +2491,6 @@ POSTHOOK: Input: default@t3
 0
 0
 0
-4
-4
-8
-8
 10
 10
 10
@@ -2504,6 +2504,10 @@ POSTHOOK: Input: default@t3
 16
 18
 20
+4
+4
+8
+8
 PREHOOK: query: explain select a.key from t3 a left semi join t2 b on a.value = b.value where a.key > 100
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t3 a left semi join t2 b on a.value = b.value where a.key > 100

Modified: hive/trunk/ql/src/test/results/clientpositive/sort.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/sort.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/sort.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/sort.q.out Tue Jan 20 05:43:52 2015
@@ -1,7 +1,11 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT x.* FROM SRC x SORT BY key
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT x.* FROM SRC x SORT BY key
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/auto_join21.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/auto_join21.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/auto_join21.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/auto_join21.q.out Tue Jan 20 05:43:52 2015
@@ -1,7 +1,11 @@
-PREHOOK: query: explain
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+explain
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 PREHOOK: type: QUERY
-POSTHOOK: query: explain
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+explain
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/auto_join23.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/auto_join23.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/auto_join23.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/auto_join23.q.out Tue Jan 20 05:43:52 2015
@@ -1,8 +1,12 @@
 Warning: Map Join MAPJOIN[12][bigTable=?] in task 'Stage-1:MAPRED' is a cross product
-PREHOOK: query: explain 
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+explain 
 SELECT  *  FROM src src1 JOIN src src2 WHERE src1.key < 10 and src2.key < 10 SORT BY src1.key, src1.value, src2.key, src2.value
 PREHOOK: type: QUERY
-POSTHOOK: query: explain 
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+explain 
 SELECT  *  FROM src src1 JOIN src src2 WHERE src1.key < 10 and src2.key < 10 SORT BY src1.key, src1.value, src2.key, src2.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/groupby2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/groupby2.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/groupby2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/groupby2.q.out Tue Jan 20 05:43:52 2015
@@ -87,11 +87,15 @@ POSTHOOK: Output: default@dest_g2
 POSTHOOK: Lineage: dest_g2.c1 EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: dest_g2.c2 EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: dest_g2.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-PREHOOK: query: SELECT dest_g2.* FROM dest_g2
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+SELECT dest_g2.* FROM dest_g2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest_g2
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT dest_g2.* FROM dest_g2
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+SELECT dest_g2.* FROM dest_g2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest_g2
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer2.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer2.q.out Tue Jan 20 05:43:52 2015
@@ -14,12 +14,16 @@ POSTHOOK: query: CREATE TABLE dest_g3(ke
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@dest_g3
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest_g2 SELECT substr(src.key,1,1), count(DISTINCT src.key) WHERE substr(src.key,1,1) >= 5 GROUP BY substr(src.key,1,1)
 INSERT OVERWRITE TABLE dest_g3 SELECT substr(src.key,1,1), count(DISTINCT src.key), count(src.value) WHERE substr(src.key,1,1) < 5 GROUP BY substr(src.key,1,1)
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest_g2 SELECT substr(src.key,1,1), count(DISTINCT src.key) WHERE substr(src.key,1,1) >= 5 GROUP BY substr(src.key,1,1)
 INSERT OVERWRITE TABLE dest_g3 SELECT substr(src.key,1,1), count(DISTINCT src.key), count(src.value) WHERE substr(src.key,1,1) < 5 GROUP BY substr(src.key,1,1)

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out Tue Jan 20 05:43:52 2015
@@ -1,8 +1,12 @@
-PREHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@dest1
-POSTHOOK: query: CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE dest1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@dest1

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/input14.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/input14.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/input14.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/input14.q.out Tue Jan 20 05:43:52 2015
@@ -111,11 +111,15 @@ 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: query: -- SORT_QUERY_RESULTS
+
+SELECT dest1.* FROM dest1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest1
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT dest1.* FROM dest1
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+SELECT dest1.* FROM dest1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/input17.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/input17.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/input17.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/input17.q.out Tue Jan 20 05:43:52 2015
@@ -108,15 +108,18 @@ POSTHOOK: Input: default@src_thrift
 POSTHOOK: Output: default@dest1
 POSTHOOK: Lineage: dest1.key SCRIPT [(src_thrift)src_thrift.FieldSchema(name:aint, type:int, comment:from deserializer), (src_thrift)src_thrift.FieldSchema(name:lint, type:array<int>, comment:from deserializer), (src_thrift)src_thrift.FieldSchema(name:lintstring, type:array<struct<myint:int,mystring:string,underscore_int:int>>, comment:from deserializer), ]
 POSTHOOK: Lineage: dest1.value SCRIPT [(src_thrift)src_thrift.FieldSchema(name:aint, type:int, comment:from deserializer), (src_thrift)src_thrift.FieldSchema(name:lint, type:array<int>, comment:from deserializer), (src_thrift)src_thrift.FieldSchema(name:lintstring, type:array<struct<myint:int,mystring:string,underscore_int:int>>, comment:from deserializer), ]
-PREHOOK: query: SELECT dest1.* FROM dest1
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+SELECT dest1.* FROM dest1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest1
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT dest1.* FROM dest1
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+SELECT dest1.* FROM dest1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####
-NULL	NULL
 -1461153966	{"myint":49,"mystring":"343","underscore_int":7}
 -1952710705	{"myint":25,"mystring":"125","underscore_int":5}
 -734328905	{"myint":16,"mystring":"64","underscore_int":4}
@@ -127,3 +130,4 @@ NULL	NULL
 336964422	{"myint":81,"mystring":"729","underscore_int":9}
 465985201	{"myint":1,"mystring":"1","underscore_int":1}
 477111225	{"myint":9,"mystring":"27","underscore_int":3}
+NULL	NULL

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/input18.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/input18.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/input18.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/input18.q.out Tue Jan 20 05:43:52 2015
@@ -111,11 +111,15 @@ 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: query: -- SORT_QUERY_RESULTS
+
+SELECT dest1.* FROM dest1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest1
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT dest1.* FROM dest1
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+SELECT dest1.* FROM dest1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/input_part2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/input_part2.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/input_part2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/input_part2.q.out Tue Jan 20 05:43:52 2015
@@ -14,12 +14,16 @@ POSTHOOK: query: CREATE TABLE dest2(key
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@dest2
-PREHOOK: query: EXPLAIN EXTENDED
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN EXTENDED
 FROM srcpart
 INSERT OVERWRITE TABLE dest1 SELECT srcpart.key, srcpart.value, srcpart.hr, srcpart.ds WHERE srcpart.key < 100 and srcpart.ds = '2008-04-08' and srcpart.hr = '12'
 INSERT OVERWRITE TABLE dest2 SELECT srcpart.key, srcpart.value, srcpart.hr, srcpart.ds WHERE srcpart.key < 100 and srcpart.ds = '2008-04-09' and srcpart.hr = '12'
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN EXTENDED
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN EXTENDED
 FROM srcpart
 INSERT OVERWRITE TABLE dest1 SELECT srcpart.key, srcpart.value, srcpart.hr, srcpart.ds WHERE srcpart.key < 100 and srcpart.ds = '2008-04-08' and srcpart.hr = '12'
 INSERT OVERWRITE TABLE dest2 SELECT srcpart.key, srcpart.value, srcpart.hr, srcpart.ds WHERE srcpart.key < 100 and srcpart.ds = '2008-04-09' and srcpart.hr = '12'
@@ -401,13 +405,6 @@ POSTHOOK: Input: default@dest1
 0	val_0	12	2008-04-08
 0	val_0	12	2008-04-08
 0	val_0	12	2008-04-08
-2	val_2	12	2008-04-08
-4	val_4	12	2008-04-08
-5	val_5	12	2008-04-08
-5	val_5	12	2008-04-08
-5	val_5	12	2008-04-08
-8	val_8	12	2008-04-08
-9	val_9	12	2008-04-08
 10	val_10	12	2008-04-08
 11	val_11	12	2008-04-08
 12	val_12	12	2008-04-08
@@ -418,6 +415,7 @@ POSTHOOK: Input: default@dest1
 18	val_18	12	2008-04-08
 18	val_18	12	2008-04-08
 19	val_19	12	2008-04-08
+2	val_2	12	2008-04-08
 20	val_20	12	2008-04-08
 24	val_24	12	2008-04-08
 24	val_24	12	2008-04-08
@@ -433,12 +431,16 @@ POSTHOOK: Input: default@dest1
 35	val_35	12	2008-04-08
 37	val_37	12	2008-04-08
 37	val_37	12	2008-04-08
+4	val_4	12	2008-04-08
 41	val_41	12	2008-04-08
 42	val_42	12	2008-04-08
 42	val_42	12	2008-04-08
 43	val_43	12	2008-04-08
 44	val_44	12	2008-04-08
 47	val_47	12	2008-04-08
+5	val_5	12	2008-04-08
+5	val_5	12	2008-04-08
+5	val_5	12	2008-04-08
 51	val_51	12	2008-04-08
 51	val_51	12	2008-04-08
 53	val_53	12	2008-04-08
@@ -462,6 +464,7 @@ POSTHOOK: Input: default@dest1
 76	val_76	12	2008-04-08
 77	val_77	12	2008-04-08
 78	val_78	12	2008-04-08
+8	val_8	12	2008-04-08
 80	val_80	12	2008-04-08
 82	val_82	12	2008-04-08
 83	val_83	12	2008-04-08
@@ -471,6 +474,7 @@ POSTHOOK: Input: default@dest1
 85	val_85	12	2008-04-08
 86	val_86	12	2008-04-08
 87	val_87	12	2008-04-08
+9	val_9	12	2008-04-08
 90	val_90	12	2008-04-08
 90	val_90	12	2008-04-08
 90	val_90	12	2008-04-08
@@ -493,13 +497,6 @@ POSTHOOK: Input: default@dest2
 0	val_0	12	2008-04-09
 0	val_0	12	2008-04-09
 0	val_0	12	2008-04-09
-2	val_2	12	2008-04-09
-4	val_4	12	2008-04-09
-5	val_5	12	2008-04-09
-5	val_5	12	2008-04-09
-5	val_5	12	2008-04-09
-8	val_8	12	2008-04-09
-9	val_9	12	2008-04-09
 10	val_10	12	2008-04-09
 11	val_11	12	2008-04-09
 12	val_12	12	2008-04-09
@@ -510,6 +507,7 @@ POSTHOOK: Input: default@dest2
 18	val_18	12	2008-04-09
 18	val_18	12	2008-04-09
 19	val_19	12	2008-04-09
+2	val_2	12	2008-04-09
 20	val_20	12	2008-04-09
 24	val_24	12	2008-04-09
 24	val_24	12	2008-04-09
@@ -525,12 +523,16 @@ POSTHOOK: Input: default@dest2
 35	val_35	12	2008-04-09
 37	val_37	12	2008-04-09
 37	val_37	12	2008-04-09
+4	val_4	12	2008-04-09
 41	val_41	12	2008-04-09
 42	val_42	12	2008-04-09
 42	val_42	12	2008-04-09
 43	val_43	12	2008-04-09
 44	val_44	12	2008-04-09
 47	val_47	12	2008-04-09
+5	val_5	12	2008-04-09
+5	val_5	12	2008-04-09
+5	val_5	12	2008-04-09
 51	val_51	12	2008-04-09
 51	val_51	12	2008-04-09
 53	val_53	12	2008-04-09
@@ -554,6 +556,7 @@ POSTHOOK: Input: default@dest2
 76	val_76	12	2008-04-09
 77	val_77	12	2008-04-09
 78	val_78	12	2008-04-09
+8	val_8	12	2008-04-09
 80	val_80	12	2008-04-09
 82	val_82	12	2008-04-09
 83	val_83	12	2008-04-09
@@ -563,6 +566,7 @@ POSTHOOK: Input: default@dest2
 85	val_85	12	2008-04-09
 86	val_86	12	2008-04-09
 87	val_87	12	2008-04-09
+9	val_9	12	2008-04-09
 90	val_90	12	2008-04-09
 90	val_90	12	2008-04-09
 90	val_90	12	2008-04-09

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/join0.q.java1.7.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/join0.q.java1.7.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/join0.q.java1.7.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/join0.q.java1.7.out Tue Jan 20 05:43:52 2015
@@ -1,5 +1,6 @@
 Warning: Shuffle Join JOIN[8][tables = [src1, src2]] in Work 'Reducer 2' is a cross product
 PREHOOK: query: -- JAVA_VERSION_SPECIFIC_OUTPUT
+-- SORT_QUERY_RESULTS
 
 EXPLAIN
 SELECT src1.key as k1, src1.value as v1, 
@@ -10,6 +11,7 @@ SELECT src1.key as k1, src1.value as v1,
   SORT BY k1, v1, k2, v2
 PREHOOK: type: QUERY
 POSTHOOK: query: -- JAVA_VERSION_SPECIFIC_OUTPUT
+-- SORT_QUERY_RESULTS
 
 EXPLAIN
 SELECT src1.key as k1, src1.value as v1, 

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/join15.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/join15.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/join15.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/join15.q.out Tue Jan 20 05:43:52 2015
@@ -1,7 +1,11 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key) SORT BY src1.key, src1.value, src2.key, src2.value
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key) SORT BY src1.key, src1.value, src2.key, src2.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/join18.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/join18.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/join18.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/join18.q.out Tue Jan 20 05:43:52 2015
@@ -1,4 +1,6 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
  SELECT a.key, a.value, b.key, b.value
  FROM 
   (
@@ -11,7 +13,9 @@ PREHOOK: query: EXPLAIN
  ) b 
  ON (a.key = b.key)
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
  SELECT a.key, a.value, b.key, b.value
  FROM 
   (
@@ -164,7 +168,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@src1
 #### A masked pattern was here ####
-NULL	NULL		7
 0	3	NULL	NULL
 10	1	NULL	NULL
 100	2	NULL	NULL
@@ -474,3 +477,4 @@ NULL	NULL		7
 96	1	NULL	NULL
 97	2	NULL	NULL
 98	2	98	1
+NULL	NULL		7

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/join20.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/join20.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/join20.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/join20.q.out Tue Jan 20 05:43:52 2015
@@ -1,8 +1,12 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10) RIGHT OUTER JOIN src src3 ON (src1.key = src3.key AND src3.key < 20)
 SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10) RIGHT OUTER JOIN src src3 ON (src1.key = src3.key AND src3.key < 20)
 SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 POSTHOOK: type: QUERY
@@ -111,6 +115,64 @@ SORT BY src1.key, src1.value, src2.key,
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+2	val_2	2	val_2	2	val_2
+4	val_4	4	val_4	4	val_4
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+8	val_8	8	val_8	8	val_8
+9	val_9	9	val_9	9	val_9
 NULL	NULL	NULL	NULL	10	val_10
 NULL	NULL	NULL	NULL	100	val_100
 NULL	NULL	NULL	NULL	100	val_100
@@ -601,64 +663,6 @@ NULL	NULL	NULL	NULL	97	val_97
 NULL	NULL	NULL	NULL	97	val_97
 NULL	NULL	NULL	NULL	98	val_98
 NULL	NULL	NULL	NULL	98	val_98
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-2	val_2	2	val_2	2	val_2
-4	val_4	4	val_4	4	val_4
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-8	val_8	8	val_8	8	val_8
-9	val_9	9	val_9	9	val_9
 PREHOOK: query: EXPLAIN
 SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key < 15) RIGHT OUTER JOIN src src3 ON (src1.key = src3.key AND src3.key < 20)
 SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
@@ -772,6 +776,64 @@ SORT BY src1.key, src1.value, src2.key,
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+0	val_0	0	val_0	0	val_0
+2	val_2	2	val_2	2	val_2
+4	val_4	4	val_4	4	val_4
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+5	val_5	5	val_5	5	val_5
+8	val_8	8	val_8	8	val_8
+9	val_9	9	val_9	9	val_9
 NULL	NULL	NULL	NULL	10	val_10
 NULL	NULL	NULL	NULL	100	val_100
 NULL	NULL	NULL	NULL	100	val_100
@@ -1262,61 +1324,3 @@ NULL	NULL	NULL	NULL	97	val_97
 NULL	NULL	NULL	NULL	97	val_97
 NULL	NULL	NULL	NULL	98	val_98
 NULL	NULL	NULL	NULL	98	val_98
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-0	val_0	0	val_0	0	val_0
-2	val_2	2	val_2	2	val_2
-4	val_4	4	val_4	4	val_4
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-5	val_5	5	val_5	5	val_5
-8	val_8	8	val_8	8	val_8
-9	val_9	9	val_9	9	val_9

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/join21.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/join21.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/join21.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/join21.q.out Tue Jan 20 05:43:52 2015
@@ -1,7 +1,11 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/join23.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/join23.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/join23.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/join23.q.out Tue Jan 20 05:43:52 2015
@@ -1,8 +1,12 @@
 Warning: Shuffle Join JOIN[4][tables = [src1, src2]] in Work 'Reducer 2' is a cross product
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT *  FROM src src1 JOIN src src2 WHERE src1.key < 10 and src2.key < 10 SORT BY src1.key, src1.value, src2.key, src2.value
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT *  FROM src src1 JOIN src src2 WHERE src1.key < 10 and src2.key < 10 SORT BY src1.key, src1.value, src2.key, src2.value
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/join6.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/join6.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/join6.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/join6.q.out Tue Jan 20 05:43:52 2015
@@ -6,7 +6,9 @@ POSTHOOK: query: CREATE TABLE dest1(c1 I
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@dest1
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 FROM (
  FROM 
   (
@@ -21,7 +23,9 @@ FROM (
 ) c
 INSERT OVERWRITE TABLE dest1 SELECT c.c1, c.c2, c.c3, c.c4
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 FROM (
  FROM 
   (

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/join7.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/join7.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/join7.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/join7.q.out Tue Jan 20 05:43:52 2015
@@ -6,7 +6,9 @@ POSTHOOK: query: CREATE TABLE dest1(c1 I
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@dest1
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 FROM (
  FROM 
   (
@@ -26,7 +28,9 @@ FROM (
 ) c
 INSERT OVERWRITE TABLE dest1 SELECT c.c1, c.c2, c.c3, c.c4, c.c5, c.c6
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 FROM (
  FROM 
   (

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/join_array.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/join_array.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/join_array.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/join_array.q.out Tue Jan 20 05:43:52 2015
@@ -30,11 +30,15 @@ POSTHOOK: query: load data local inpath
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@tinyb
-PREHOOK: query: select * from tinyA
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+select * from tinyA
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tinya
 #### A masked pattern was here ####
-POSTHOOK: query: select * from tinyA
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+select * from tinyA
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tinya
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/limit_partition_metadataonly.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/limit_partition_metadataonly.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/limit_partition_metadataonly.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/limit_partition_metadataonly.q.out Tue Jan 20 05:43:52 2015
@@ -1,6 +1,10 @@
-PREHOOK: query: explain select ds from srcpart where hr=11 and ds='2008-04-08'
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+explain select ds from srcpart where hr=11 and ds='2008-04-08'
 PREHOOK: type: QUERY
-POSTHOOK: query: explain select ds from srcpart where hr=11 and ds='2008-04-08'
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+explain select ds from srcpart where hr=11 and ds='2008-04-08'
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-0 is a root stage

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/mapjoin_filter_on_outerjoin.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/mapjoin_filter_on_outerjoin.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/mapjoin_filter_on_outerjoin.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/mapjoin_filter_on_outerjoin.q.out Tue Jan 20 05:43:52 2015
@@ -1,4 +1,6 @@
-PREHOOK: query: --HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+--HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition
 
 SELECT * FROM src1
   RIGHT OUTER JOIN src1 src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10)
@@ -8,7 +10,9 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Input: default@src1
 #### A masked pattern was here ####
-POSTHOOK: query: --HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+--HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition
 
 SELECT * FROM src1
   RIGHT OUTER JOIN src1 src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10)

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/mapjoin_test_outer.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/mapjoin_test_outer.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/mapjoin_test_outer.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/mapjoin_test_outer.q.out Tue Jan 20 05:43:52 2015
@@ -1,10 +1,14 @@
-PREHOOK: query: --HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+--HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition
 
 create table dest_1 (key STRING, value STRING) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@dest_1
-POSTHOOK: query: --HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+--HIVE-2101 mapjoin sometimes gives wrong results if there is a filter in the on condition
 
 create table dest_1 (key STRING, value STRING) stored as textfile
 POSTHOOK: type: CREATETABLE
@@ -66,7 +70,6 @@ POSTHOOK: Input: default@dest_1
 POSTHOOK: Input: default@dest_2
 POSTHOOK: Input: default@src1
 #### A masked pattern was here ####
-NULL	NULL	333444	555666	333444	555666
 					
 					
 					
@@ -231,6 +234,7 @@ NULL	NULL	333444	555666	333444	555666
 146	val_146	146	val_146	146	val_146
 224		224		224	
 369		369		369	
+NULL	NULL	333444	555666	333444	555666
 PREHOOK: query: explain
 SELECT /*+ mapjoin(src1, src2) */ * FROM src1
   RIGHT OUTER JOIN dest_1 src2 ON (src1.key = src2.key)
@@ -350,7 +354,6 @@ POSTHOOK: Input: default@dest_1
 POSTHOOK: Input: default@dest_2
 POSTHOOK: Input: default@src1
 #### A masked pattern was here ####
-NULL	NULL	333444	555666	333444	555666
 					
 					
 					
@@ -515,6 +518,7 @@ NULL	NULL	333444	555666	333444	555666
 146	val_146	146	val_146	146	val_146
 224		224		224	
 369		369		369	
+NULL	NULL	333444	555666	333444	555666
 PREHOOK: query: SELECT /*+ mapjoin(src1, src2) */ * FROM src1
   RIGHT OUTER JOIN dest_1 src2 ON (src1.key = src2.key)
   JOIN dest_2 src3 ON (src1.key = src3.key)
@@ -1180,7 +1184,6 @@ POSTHOOK: Input: default@dest_1
 POSTHOOK: Input: default@dest_2
 POSTHOOK: Input: default@src1
 #### A masked pattern was here ####
-NULL	NULL	333444	555666	333444	555666
 					
 					
 					
@@ -1345,3 +1348,4 @@ NULL	NULL	333444	555666	333444	555666
 146	val_146	146	val_146	146	val_146
 224		224		224	
 369		369		369	
+NULL	NULL	333444	555666	333444	555666

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/ppd_transform.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/ppd_transform.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/ppd_transform.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/ppd_transform.q.out Tue Jan 20 05:43:52 2015
@@ -1,4 +1,6 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 FROM (
   FROM src
   SELECT TRANSFORM(src.key, src.value)
@@ -7,7 +9,9 @@ FROM (
 ) tmap
 SELECT tmap.tkey, tmap.tvalue WHERE tmap.tkey < 100
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 FROM (
   FROM src
   SELECT TRANSFORM(src.key, src.value)

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/ptf_matchpath.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/ptf_matchpath.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/ptf_matchpath.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/ptf_matchpath.q.out Tue Jan 20 05:43:52 2015
@@ -34,7 +34,9 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@flights_tiny
-PREHOOK: query: -- 1. basic Matchpath test
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- 1. basic Matchpath test
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath 
 from matchpath(on 
         flights_tiny 
@@ -47,7 +49,9 @@ from matchpath(on
 PREHOOK: type: QUERY
 PREHOOK: Input: default@flights_tiny
 #### A masked pattern was here ####
-POSTHOOK: query: -- 1. basic Matchpath test
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- 1. basic Matchpath test
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath 
 from matchpath(on 
         flights_tiny 
@@ -65,17 +69,17 @@ Baltimore	1142	2010	10	21	5	21
 Baltimore	1142	2010	10	22	4	22
 Baltimore	1142	2010	10	25	3	25
 Baltimore	1142	2010	10	26	2	26
-Chicago	1531	2010	10	21	2	21
-Chicago	1531	2010	10	25	3	25
-Chicago	1531	2010	10	26	2	26
 Baltimore	1599	2010	10	21	2	21
 Baltimore	1599	2010	10	25	3	25
 Baltimore	1599	2010	10	26	2	26
+Chicago	1531	2010	10	21	2	21
+Chicago	1531	2010	10	25	3	25
+Chicago	1531	2010	10	26	2	26
 Chicago	361	2010	10	20	2	20
-Washington	7291	2010	10	27	2	27
 Chicago	897	2010	10	20	4	20
 Chicago	897	2010	10	21	3	21
 Chicago	897	2010	10	22	2	22
+Washington	7291	2010	10	27	2	27
 PREHOOK: query: -- 2. Matchpath on 1 partition
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath 
 from matchpath(on 

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/ptf_rcfile.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/ptf_rcfile.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/ptf_rcfile.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/ptf_rcfile.q.out Tue Jan 20 05:43:52 2015
@@ -38,7 +38,9 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@part_rc
-PREHOOK: query: -- testWindowingPTFWithPartRC
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- testWindowingPTFWithPartRC
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -49,7 +51,9 @@ order by p_name)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part_rc
 #### A masked pattern was here ####
-POSTHOOK: query: -- testWindowingPTFWithPartRC
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- testWindowingPTFWithPartRC
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/ptf_register_tblfn.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/ptf_register_tblfn.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/ptf_register_tblfn.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/ptf_register_tblfn.q.out Tue Jan 20 05:43:52 2015
@@ -40,7 +40,9 @@ PREHOOK: Output: matchpathtest
 POSTHOOK: query: create temporary function matchpathtest as 'org.apache.hadoop.hive.ql.udf.ptf.MatchPath$MatchPathResolver'
 POSTHOOK: type: CREATEFUNCTION
 POSTHOOK: Output: matchpathtest
-PREHOOK: query: -- 1. basic Matchpath test
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- 1. basic Matchpath test
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath 
 from matchpathtest(on 
         flights_tiny 
@@ -53,7 +55,9 @@ from matchpathtest(on
 PREHOOK: type: QUERY
 PREHOOK: Input: default@flights_tiny
 #### A masked pattern was here ####
-POSTHOOK: query: -- 1. basic Matchpath test
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- 1. basic Matchpath test
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath 
 from matchpathtest(on 
         flights_tiny 
@@ -71,17 +75,17 @@ Baltimore	1142	2010	10	21	5	21
 Baltimore	1142	2010	10	22	4	22
 Baltimore	1142	2010	10	25	3	25
 Baltimore	1142	2010	10	26	2	26
-Chicago	1531	2010	10	21	2	21
-Chicago	1531	2010	10	25	3	25
-Chicago	1531	2010	10	26	2	26
 Baltimore	1599	2010	10	21	2	21
 Baltimore	1599	2010	10	25	3	25
 Baltimore	1599	2010	10	26	2	26
+Chicago	1531	2010	10	21	2	21
+Chicago	1531	2010	10	25	3	25
+Chicago	1531	2010	10	26	2	26
 Chicago	361	2010	10	20	2	20
-Washington	7291	2010	10	27	2	27
 Chicago	897	2010	10	20	4	20
 Chicago	897	2010	10	21	3	21
 Chicago	897	2010	10	22	2	22
+Washington	7291	2010	10	27	2	27
 PREHOOK: query: drop temporary function matchpathtest
 PREHOOK: type: DROPFUNCTION
 PREHOOK: Output: matchpathtest

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/ptf_seqfile.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/ptf_seqfile.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/ptf_seqfile.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/ptf_seqfile.q.out Tue Jan 20 05:43:52 2015
@@ -38,7 +38,9 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@part_seq
-PREHOOK: query: -- testWindowingPTFWithPartSeqFile
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- testWindowingPTFWithPartSeqFile
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 
@@ -49,7 +51,9 @@ order by p_name)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part_seq
 #### A masked pattern was here ####
-POSTHOOK: query: -- testWindowingPTFWithPartSeqFile
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- testWindowingPTFWithPartSeqFile
 select p_mfgr, p_name, p_size, 
 rank() over (partition by p_mfgr order by p_name) as r, 
 dense_rank() over (partition by p_mfgr order by p_name) as dr, 

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/sample3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/sample3.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/sample3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/sample3.q.out Tue Jan 20 05:43:52 2015
@@ -1,9 +1,13 @@
-PREHOOK: query: -- no input pruning, sample filter
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- no input pruning, sample filter
 EXPLAIN
 SELECT s.key
 FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s
 PREHOOK: type: QUERY
-POSTHOOK: query: -- no input pruning, sample filter
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- no input pruning, sample filter
 EXPLAIN
 SELECT s.key
 FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s
@@ -43,48 +47,8 @@ POSTHOOK: Input: default@srcbucket
 0
 0
 0
-5
-5
-5
-5
 10
 10
-15
-15
-15
-15
-20
-20
-20
-30
-30
-35
-35
-35
-35
-35
-35
-40
-40
-50
-60
-65
-65
-65
-70
-70
-70
-70
-75
-80
-80
-85
-85
-90
-90
-90
-95
-95
 100
 100
 100
@@ -104,6 +68,10 @@ POSTHOOK: Input: default@srcbucket
 135
 140
 145
+15
+15
+15
+15
 150
 155
 160
@@ -122,6 +90,9 @@ POSTHOOK: Input: default@srcbucket
 190
 195
 195
+20
+20
+20
 200
 200
 205
@@ -155,6 +126,8 @@ POSTHOOK: Input: default@srcbucket
 285
 295
 295
+30
+30
 300
 300
 305
@@ -172,6 +145,12 @@ POSTHOOK: Input: default@srcbucket
 335
 340
 345
+35
+35
+35
+35
+35
+35
 355
 355
 360
@@ -192,6 +171,8 @@ POSTHOOK: Input: default@srcbucket
 395
 395
 395
+40
+40
 400
 405
 410
@@ -227,3 +208,26 @@ POSTHOOK: Input: default@srcbucket
 490
 495
 495
+5
+5
+5
+5
+50
+60
+65
+65
+65
+70
+70
+70
+70
+75
+80
+80
+85
+85
+90
+90
+90
+95
+95

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/sample5.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/sample5.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/sample5.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/sample5.q.out Tue Jan 20 05:43:52 2015
@@ -6,12 +6,16 @@ POSTHOOK: query: CREATE TABLE dest1(key
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@dest1
-PREHOOK: query: -- no input pruning, sample filter
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- no input pruning, sample filter
 EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE dest1 SELECT s.* -- here's another test
 FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s
 PREHOOK: type: QUERY
-POSTHOOK: query: -- no input pruning, sample filter
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- no input pruning, sample filter
 EXPLAIN EXTENDED
 INSERT OVERWRITE TABLE dest1 SELECT s.* -- here's another test
 FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s
@@ -194,48 +198,8 @@ POSTHOOK: Input: default@dest1
 0	val_0
 0	val_1
 0	val_1
-5	val_5
-5	val_5
-5	val_5
-5	val_6
 10	val_10
 10	val_11
-15	val_15
-15	val_15
-15	val_16
-15	val_16
-20	val_20
-20	val_21
-20	val_21
-30	val_30
-30	val_31
-35	val_35
-35	val_35
-35	val_35
-35	val_36
-35	val_36
-35	val_36
-40	val_41
-40	val_41
-50	val_51
-60	val_61
-65	val_65
-65	val_66
-65	val_66
-70	val_70
-70	val_70
-70	val_70
-70	val_71
-75	val_76
-80	val_80
-80	val_81
-85	val_85
-85	val_86
-90	val_90
-90	val_90
-90	val_90
-95	val_95
-95	val_95
 100	val_100
 100	val_100
 100	val_101
@@ -255,6 +219,10 @@ POSTHOOK: Input: default@dest1
 135	val_136
 140	val_141
 145	val_145
+15	val_15
+15	val_15
+15	val_16
+15	val_16
 150	val_150
 155	val_155
 160	val_160
@@ -273,6 +241,9 @@ POSTHOOK: Input: default@dest1
 190	val_190
 195	val_195
 195	val_195
+20	val_20
+20	val_21
+20	val_21
 200	val_200
 200	val_200
 205	val_205
@@ -306,6 +277,8 @@ POSTHOOK: Input: default@dest1
 285	val_286
 295	val_296
 295	val_296
+30	val_30
+30	val_31
 300	val_301
 300	val_301
 305	val_305
@@ -323,6 +296,12 @@ POSTHOOK: Input: default@dest1
 335	val_336
 340	val_341
 345	val_345
+35	val_35
+35	val_35
+35	val_35
+35	val_36
+35	val_36
+35	val_36
 355	val_356
 355	val_356
 360	val_360
@@ -343,6 +322,8 @@ POSTHOOK: Input: default@dest1
 395	val_395
 395	val_396
 395	val_396
+40	val_41
+40	val_41
 400	val_400
 405	val_406
 410	val_411
@@ -378,3 +359,26 @@ POSTHOOK: Input: default@dest1
 490	val_491
 495	val_495
 495	val_496
+5	val_5
+5	val_5
+5	val_5
+5	val_6
+50	val_51
+60	val_61
+65	val_65
+65	val_66
+65	val_66
+70	val_70
+70	val_70
+70	val_70
+70	val_71
+75	val_76
+80	val_80
+80	val_81
+85	val_85
+85	val_86
+90	val_90
+90	val_90
+90	val_90
+95	val_95
+95	val_95

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/scriptfile1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/scriptfile1.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/scriptfile1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/scriptfile1.q.out Tue Jan 20 05:43:52 2015
@@ -1,9 +1,13 @@
-PREHOOK: query: -- EXCLUDE_OS_WINDOWS
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- EXCLUDE_OS_WINDOWS
 CREATE TABLE dest1(key INT, value STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@dest1
-POSTHOOK: query: -- EXCLUDE_OS_WINDOWS
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- EXCLUDE_OS_WINDOWS
 CREATE TABLE dest1(key INT, value STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/semijoin.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/semijoin.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/semijoin.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/semijoin.q.out Tue Jan 20 05:43:52 2015
@@ -1,9 +1,13 @@
-PREHOOK: query: create table t1 as select cast(key as int) key, value from src where key <= 10
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+create table t1 as select cast(key as int) key, value from src where key <= 10
 PREHOOK: type: CREATETABLE_AS_SELECT
 PREHOOK: Input: default@src
 PREHOOK: Output: database:default
 PREHOOK: Output: default@t1
-POSTHOOK: query: create table t1 as select cast(key as int) key, value from src where key <= 10
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+create table t1 as select cast(key as int) key, value from src where key <= 10
 POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@src
 POSTHOOK: Output: database:default
@@ -19,6 +23,7 @@ POSTHOOK: Input: default@t1
 0	val_0
 0	val_0
 0	val_0
+10	val_10
 2	val_2
 4	val_4
 5	val_5
@@ -26,7 +31,6 @@ POSTHOOK: Input: default@t1
 5	val_5
 8	val_8
 9	val_9
-10	val_10
 PREHOOK: query: create table t2 as select cast(2*key as int) key, value from t1
 PREHOOK: type: CREATETABLE_AS_SELECT
 PREHOOK: Input: default@t1
@@ -48,14 +52,14 @@ POSTHOOK: Input: default@t2
 0	val_0
 0	val_0
 0	val_0
-4	val_2
-8	val_4
 10	val_5
 10	val_5
 10	val_5
 16	val_8
 18	val_9
 20	val_10
+4	val_2
+8	val_4
 PREHOOK: query: create table t3 as select * from (select * from t1 union all select * from t2) b
 PREHOOK: type: CREATETABLE_AS_SELECT
 PREHOOK: Input: default@t1
@@ -82,7 +86,14 @@ POSTHOOK: Input: default@t3
 0	val_0
 0	val_0
 0	val_0
+10	val_10
+10	val_5
+10	val_5
+10	val_5
+16	val_8
+18	val_9
 2	val_2
+20	val_10
 4	val_2
 4	val_4
 5	val_5
@@ -91,13 +102,6 @@ POSTHOOK: Input: default@t3
 8	val_4
 8	val_8
 9	val_9
-10	val_10
-10	val_5
-10	val_5
-10	val_5
-16	val_8
-18	val_9
-20	val_10
 PREHOOK: query: create table t4 (key int, value string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
@@ -213,9 +217,9 @@ POSTHOOK: Input: default@t2
 0	val_0
 0	val_0
 0	val_0
+10	val_10
 4	val_4
 8	val_8
-10	val_10
 PREHOOK: query: explain select * from t2 a left semi join t1 b on b.key=a.key sort by a.key, a.value
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from t2 a left semi join t1 b on b.key=a.key sort by a.key, a.value
@@ -315,11 +319,11 @@ POSTHOOK: Input: default@t2
 0	val_0
 0	val_0
 0	val_0
-4	val_2
-8	val_4
 10	val_5
 10	val_5
 10	val_5
+4	val_2
+8	val_4
 PREHOOK: query: explain select * from t1 a left semi join t4 b on b.key=a.key sort by a.key, a.value
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from t1 a left semi join t4 b on b.key=a.key sort by a.key, a.value
@@ -921,11 +925,11 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@t1
 POSTHOOK: Input: default@t2
 #### A masked pattern was here ####
-4	val_2
-8	val_4
 10	val_5
 10	val_5
 10	val_5
+4	val_2
+8	val_4
 PREHOOK: query: explain select /*+ mapjoin(b) */ a.key from t3 a left semi join t1 b on a.key = b.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select /*+ mapjoin(b) */ a.key from t3 a left semi join t1 b on a.key = b.key sort by a.key
@@ -1030,6 +1034,10 @@ POSTHOOK: Input: default@t3
 0
 0
 0
+10
+10
+10
+10
 2
 4
 4
@@ -1039,10 +1047,6 @@ POSTHOOK: Input: default@t3
 8
 8
 9
-10
-10
-10
-10
 PREHOOK: query: explain select * from t1 a left semi join t2 b on a.key = 2*b.key sort by a.key, a.value
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from t1 a left semi join t2 b on a.key = 2*b.key sort by a.key, a.value
@@ -1271,11 +1275,11 @@ POSTHOOK: Input: default@t3
 0	val_0	0	val_0
 0	val_0	0	val_0
 0	val_0	0	val_0
-4	val_4	4	val_2
-8	val_8	8	val_4
 10	val_10	10	val_5
 10	val_10	10	val_5
 10	val_10	10	val_5
+4	val_4	4	val_2
+8	val_8	8	val_4
 PREHOOK: query: explain select * from t3 a left semi join t1 b on a.key = b.key and a.value=b.value sort by a.key, a.value
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from t3 a left semi join t1 b on a.key = b.key and a.value=b.value sort by a.key, a.value
@@ -1377,6 +1381,7 @@ POSTHOOK: Input: default@t3
 0	val_0
 0	val_0
 0	val_0
+10	val_10
 2	val_2
 4	val_4
 5	val_5
@@ -1384,7 +1389,6 @@ POSTHOOK: Input: default@t3
 5	val_5
 8	val_8
 9	val_9
-10	val_10
 PREHOOK: query: explain select /*+ mapjoin(b, c) */ a.key from t3 a left semi join t1 b on a.key = b.key left semi join t2 c on a.key = c.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select /*+ mapjoin(b, c) */ a.key from t3 a left semi join t1 b on a.key = b.key left semi join t2 c on a.key = c.key sort by a.key
@@ -1519,14 +1523,14 @@ POSTHOOK: Input: default@t3
 0
 0
 0
-4
-4
-8
-8
 10
 10
 10
 10
+4
+4
+8
+8
 PREHOOK: query: explain select a.key from t3 a left outer join t1 b on a.key = b.key left semi join t2 c on b.key = c.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t3 a left outer join t1 b on a.key = b.key left semi join t2 c on b.key = c.key sort by a.key
@@ -1648,14 +1652,14 @@ POSTHOOK: Input: default@t3
 0
 0
 0
-4
-4
-8
-8
 10
 10
 10
 10
+4
+4
+8
+8
 PREHOOK: query: explain select a.key from t1 a right outer join t3 b on a.key = b.key left semi join t2 c on b.key = c.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t1 a right outer join t3 b on a.key = b.key left semi join t2 c on b.key = c.key sort by a.key
@@ -1759,9 +1763,6 @@ POSTHOOK: Input: default@t1
 POSTHOOK: Input: default@t2
 POSTHOOK: Input: default@t3
 #### A masked pattern was here ####
-NULL
-NULL
-NULL
 0
 0
 0
@@ -1780,14 +1781,17 @@ NULL
 0
 0
 0
-4
-4
-8
-8
 10
 10
 10
 10
+4
+4
+8
+8
+NULL
+NULL
+NULL
 PREHOOK: query: explain select a.key from t1 a full outer join t3 b on a.key = b.key left semi join t2 c on b.key = c.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t1 a full outer join t3 b on a.key = b.key left semi join t2 c on b.key = c.key sort by a.key
@@ -1891,9 +1895,6 @@ POSTHOOK: Input: default@t1
 POSTHOOK: Input: default@t2
 POSTHOOK: Input: default@t3
 #### A masked pattern was here ####
-NULL
-NULL
-NULL
 0
 0
 0
@@ -1912,14 +1913,17 @@ NULL
 0
 0
 0
-4
-4
-8
-8
 10
 10
 10
 10
+4
+4
+8
+8
+NULL
+NULL
+NULL
 PREHOOK: query: explain select a.key from t3 a left semi join t2 b on a.key = b.key left outer join t1 c on a.key = c.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t3 a left semi join t2 b on a.key = b.key left outer join t1 c on a.key = c.key sort by a.key
@@ -2041,10 +2045,6 @@ POSTHOOK: Input: default@t3
 0
 0
 0
-4
-4
-8
-8
 10
 10
 10
@@ -2052,6 +2052,10 @@ POSTHOOK: Input: default@t3
 16
 18
 20
+4
+4
+8
+8
 PREHOOK: query: explain select a.key from t3 a left semi join t2 b on a.key = b.key right outer join t1 c on a.key = c.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t3 a left semi join t2 b on a.key = b.key right outer join t1 c on a.key = c.key sort by a.key
@@ -2155,11 +2159,6 @@ POSTHOOK: Input: default@t1
 POSTHOOK: Input: default@t2
 POSTHOOK: Input: default@t3
 #### A masked pattern was here ####
-NULL
-NULL
-NULL
-NULL
-NULL
 0
 0
 0
@@ -2178,14 +2177,19 @@ NULL
 0
 0
 0
-4
-4
-8
-8
 10
 10
 10
 10
+4
+4
+8
+8
+NULL
+NULL
+NULL
+NULL
+NULL
 PREHOOK: query: explain select a.key from t3 a left semi join t1 b on a.key = b.key full outer join t2 c on a.key = c.key sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t3 a left semi join t1 b on a.key = b.key full outer join t2 c on a.key = c.key sort by a.key
@@ -2289,9 +2293,6 @@ POSTHOOK: Input: default@t1
 POSTHOOK: Input: default@t2
 POSTHOOK: Input: default@t3
 #### A masked pattern was here ####
-NULL
-NULL
-NULL
 0
 0
 0
@@ -2310,15 +2311,6 @@ NULL
 0
 0
 0
-2
-4
-4
-5
-5
-5
-8
-8
-9
 10
 10
 10
@@ -2331,6 +2323,18 @@ NULL
 10
 10
 10
+2
+4
+4
+5
+5
+5
+8
+8
+9
+NULL
+NULL
+NULL
 PREHOOK: query: explain select a.key from t3 a left semi join t2 b on a.key = b.key left outer join t1 c on a.value = c.value sort by a.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t3 a left semi join t2 b on a.key = b.key left outer join t1 c on a.value = c.value sort by a.key
@@ -2474,10 +2478,6 @@ POSTHOOK: Input: default@t3
 0
 0
 0
-4
-4
-8
-8
 10
 10
 10
@@ -2491,6 +2491,10 @@ POSTHOOK: Input: default@t3
 16
 18
 20
+4
+4
+8
+8
 PREHOOK: query: explain select a.key from t3 a left semi join t2 b on a.value = b.value where a.key > 100
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select a.key from t3 a left semi join t2 b on a.value = b.value where a.key > 100

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/sort.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/sort.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/sort.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/sort.q.out Tue Jan 20 05:43:52 2015
@@ -1,7 +1,11 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT x.* FROM SRC x SORT BY key
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
 SELECT x.* FROM SRC x SORT BY key
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/stats1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/stats1.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/stats1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/stats1.q.out Tue Jan 20 05:43:52 2015
@@ -1,8 +1,12 @@
-PREHOOK: query: create table tmptable(key string, value string)
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+create table tmptable(key string, value string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@tmptable
-POSTHOOK: query: create table tmptable(key string, value string)
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+create table tmptable(key string, value string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@tmptable

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out Tue Jan 20 05:43:52 2015
@@ -1,4 +1,6 @@
-PREHOOK: query: EXPLAIN EXTENDED
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN EXTENDED
 FROM (
   FROM srcpart src
   SELECT TRANSFORM(src.ds, src.key, src.value)
@@ -7,7 +9,9 @@ FROM (
 ) tmap
 SELECT tmap.tkey, tmap.tvalue WHERE tmap.tkey < 100 AND tmap.ds = '2008-04-08'
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN EXTENDED
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN EXTENDED
 FROM (
   FROM srcpart src
   SELECT TRANSFORM(src.ds, src.key, src.value)

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out Tue Jan 20 05:43:52 2015
@@ -1,4 +1,6 @@
-PREHOOK: query: EXPLAIN EXTENDED
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN EXTENDED
 FROM (
   FROM srcpart src
   SELECT TRANSFORM(src.ds, src.key, src.value)
@@ -8,7 +10,9 @@ FROM (
 ) tmap
 SELECT tmap.tkey, tmap.tvalue WHERE tmap.tkey < 100
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN EXTENDED
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN EXTENDED
 FROM (
   FROM srcpart src
   SELECT TRANSFORM(src.ds, src.key, src.value)

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/union10.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/union10.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/union10.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/union10.q.out Tue Jan 20 05:43:52 2015
@@ -1,10 +1,14 @@
-PREHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by filesink
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by filesink
 
 create table tmptable(key string, value int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@tmptable
-POSTHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by filesink
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by filesink
 
 create table tmptable(key string, value int)
 POSTHOOK: type: CREATETABLE

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/union18.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/union18.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/union18.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/union18.q.out Tue Jan 20 05:43:52 2015
@@ -14,7 +14,9 @@ POSTHOOK: query: CREATE TABLE DEST2(key
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@DEST2
-PREHOOK: query: -- union case:map-reduce sub-queries followed by multi-table insert 
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- union case:map-reduce sub-queries followed by multi-table insert 
 
 explain 
 FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1
@@ -23,7 +25,9 @@ FROM (select 'tst1' as key, cast(count(1
 INSERT OVERWRITE TABLE DEST1 SELECT unionsrc.key, unionsrc.value
 INSERT OVERWRITE TABLE DEST2 SELECT unionsrc.key, unionsrc.value, unionsrc.value
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case:map-reduce sub-queries followed by multi-table insert 
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- union case:map-reduce sub-queries followed by multi-table insert 
 
 explain 
 FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/union19.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/union19.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/union19.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/union19.q.out Tue Jan 20 05:43:52 2015
@@ -1,8 +1,12 @@
-PREHOOK: query: CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@DEST1
-POSTHOOK: query: CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@DEST1

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/union6.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/union6.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/union6.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/union6.q.out Tue Jan 20 05:43:52 2015
@@ -1,12 +1,14 @@
-PREHOOK: query: -- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by filesink
+PREHOOK: query: -- SORT_QUERY_RESULTS
 
+-- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by filesink
 
 create table tmptable(key string, value string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@tmptable
-POSTHOOK: query: -- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by filesink
+POSTHOOK: query: -- SORT_QUERY_RESULTS
 
+-- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by filesink
 
 create table tmptable(key string, value string)
 POSTHOOK: type: CREATETABLE

Modified: hive/trunk/ql/src/test/results/clientpositive/spark/union_ppr.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/union_ppr.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/spark/union_ppr.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/spark/union_ppr.q.out Tue Jan 20 05:43:52 2015
@@ -1,4 +1,6 @@
-PREHOOK: query: EXPLAIN EXTENDED
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN EXTENDED
 SELECT * FROM (
   SELECT X.* FROM SRCPART X WHERE X.key < 100
   UNION ALL
@@ -7,7 +9,9 @@ SELECT * FROM (
 WHERE A.ds = '2008-04-08'
 SORT BY A.key, A.value, A.ds, A.hr
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN EXTENDED
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN EXTENDED
 SELECT * FROM (
   SELECT X.* FROM SRCPART X WHERE X.key < 100
   UNION ALL

Modified: hive/trunk/ql/src/test/results/clientpositive/stats1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/stats1.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/stats1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/stats1.q.out Tue Jan 20 05:43:52 2015
@@ -1,8 +1,12 @@
-PREHOOK: query: create table tmptable(key string, value string)
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+create table tmptable(key string, value string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@tmptable
-POSTHOOK: query: create table tmptable(key string, value string)
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+create table tmptable(key string, value string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@tmptable

Modified: hive/trunk/ql/src/test/results/clientpositive/tez/groupby2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/groupby2.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/groupby2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/groupby2.q.out Tue Jan 20 05:43:52 2015
@@ -91,11 +91,15 @@ POSTHOOK: Output: default@dest_g2
 POSTHOOK: Lineage: dest_g2.c1 EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: dest_g2.c2 EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: dest_g2.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-PREHOOK: query: SELECT dest_g2.* FROM dest_g2
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+SELECT dest_g2.* FROM dest_g2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest_g2
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT dest_g2.* FROM dest_g2
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+SELECT dest_g2.* FROM dest_g2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest_g2
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/tez/join0.q.java1.7.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/join0.q.java1.7.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/join0.q.java1.7.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/join0.q.java1.7.out Tue Jan 20 05:43:52 2015
@@ -1,5 +1,6 @@
 Warning: Shuffle Join MERGEJOIN[15][tables = [src1, src2]] in Stage 'Reducer 2' is a cross product
 PREHOOK: query: -- JAVA_VERSION_SPECIFIC_OUTPUT
+-- SORT_QUERY_RESULTS
 
 EXPLAIN
 SELECT src1.key as k1, src1.value as v1, 
@@ -10,6 +11,7 @@ SELECT src1.key as k1, src1.value as v1,
   SORT BY k1, v1, k2, v2
 PREHOOK: type: QUERY
 POSTHOOK: query: -- JAVA_VERSION_SPECIFIC_OUTPUT
+-- SORT_QUERY_RESULTS
 
 EXPLAIN
 SELECT src1.key as k1, src1.value as v1, 

Modified: hive/trunk/ql/src/test/results/clientpositive/tez/scriptfile1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/scriptfile1.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/scriptfile1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/scriptfile1.q.out Tue Jan 20 05:43:52 2015
@@ -1,9 +1,13 @@
-PREHOOK: query: -- EXCLUDE_OS_WINDOWS
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- EXCLUDE_OS_WINDOWS
 CREATE TABLE dest1(key INT, value STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@dest1
-POSTHOOK: query: -- EXCLUDE_OS_WINDOWS
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- EXCLUDE_OS_WINDOWS
 CREATE TABLE dest1(key INT, value STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr1.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr1.q.out Tue Jan 20 05:43:52 2015
@@ -1,4 +1,6 @@
-PREHOOK: query: EXPLAIN EXTENDED
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN EXTENDED
 FROM (
   FROM srcpart src
   SELECT TRANSFORM(src.ds, src.key, src.value)
@@ -7,7 +9,9 @@ FROM (
 ) tmap
 SELECT tmap.tkey, tmap.tvalue WHERE tmap.tkey < 100 AND tmap.ds = '2008-04-08'
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN EXTENDED
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN EXTENDED
 FROM (
   FROM srcpart src
   SELECT TRANSFORM(src.ds, src.key, src.value)

Modified: hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr2.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/transform_ppr2.q.out Tue Jan 20 05:43:52 2015
@@ -1,4 +1,6 @@
-PREHOOK: query: EXPLAIN EXTENDED
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN EXTENDED
 FROM (
   FROM srcpart src
   SELECT TRANSFORM(src.ds, src.key, src.value)
@@ -8,7 +10,9 @@ FROM (
 ) tmap
 SELECT tmap.tkey, tmap.tvalue WHERE tmap.tkey < 100
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN EXTENDED
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN EXTENDED
 FROM (
   FROM srcpart src
   SELECT TRANSFORM(src.ds, src.key, src.value)

Modified: hive/trunk/ql/src/test/results/clientpositive/tez/union6.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/union6.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/union6.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/union6.q.out Tue Jan 20 05:43:52 2015
@@ -1,12 +1,14 @@
-PREHOOK: query: -- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by filesink
+PREHOOK: query: -- SORT_QUERY_RESULTS
 
+-- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by filesink
 
 create table tmptable(key string, value string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@tmptable
-POSTHOOK: query: -- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by filesink
+POSTHOOK: query: -- SORT_QUERY_RESULTS
 
+-- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by filesink
 
 create table tmptable(key string, value string)
 POSTHOOK: type: CREATETABLE

Modified: hive/trunk/ql/src/test/results/clientpositive/transform_ppr1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/transform_ppr1.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/transform_ppr1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/transform_ppr1.q.out Tue Jan 20 05:43:52 2015
@@ -1,4 +1,6 @@
-PREHOOK: query: EXPLAIN EXTENDED
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN EXTENDED
 FROM (
   FROM srcpart src
   SELECT TRANSFORM(src.ds, src.key, src.value)
@@ -7,7 +9,9 @@ FROM (
 ) tmap
 SELECT tmap.tkey, tmap.tvalue WHERE tmap.tkey < 100 AND tmap.ds = '2008-04-08'
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN EXTENDED
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN EXTENDED
 FROM (
   FROM srcpart src
   SELECT TRANSFORM(src.ds, src.key, src.value)

Modified: hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out Tue Jan 20 05:43:52 2015
@@ -1,4 +1,6 @@
-PREHOOK: query: EXPLAIN EXTENDED
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN EXTENDED
 FROM (
   FROM srcpart src
   SELECT TRANSFORM(src.ds, src.key, src.value)
@@ -8,7 +10,9 @@ FROM (
 ) tmap
 SELECT tmap.tkey, tmap.tvalue WHERE tmap.tkey < 100
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN EXTENDED
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN EXTENDED
 FROM (
   FROM srcpart src
   SELECT TRANSFORM(src.ds, src.key, src.value)

Modified: hive/trunk/ql/src/test/results/clientpositive/union10.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union10.q.out?rev=1653196&r1=1653195&r2=1653196&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union10.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union10.q.out Tue Jan 20 05:43:52 2015
@@ -1,10 +1,14 @@
-PREHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by filesink
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by filesink
 
 create table tmptable(key string, value int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@tmptable
-POSTHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by filesink
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by filesink
 
 create table tmptable(key string, value int)
 POSTHOOK: type: CREATETABLE



Mime
View raw message