You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2014/11/28 05:59:52 UTC

svn commit: r1642263 [2/3] - in /hive/branches/spark: ./ data/conf/ data/conf/spark/ itests/qtest-spark/ ql/src/java/org/apache/hadoop/hive/ql/exec/spark/ ql/src/java/org/apache/hadoop/hive/ql/exec/spark/status/ ql/src/test/queries/clientpositive/ ql/s...

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer3.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer3.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer3.q.out Fri Nov 28 04:59:50 2014
@@ -225,7 +225,7 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -401,7 +401,7 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -577,7 +577,7 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_position.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_position.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_position.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_position.q.out Fri Nov 28 04:59:50 2014
@@ -238,8 +238,8 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 2 <- Map 4 (GROUP PARTITION-LEVEL SORT, 1)
-        Reducer 3 <- Map 5 (GROUP PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 4 (GROUP PARTITION-LEVEL SORT, 3)
+        Reducer 3 <- Map 5 (GROUP PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 4 
@@ -438,7 +438,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
+        Reducer 2 <- Map 1 (GROUP, 3)
         Reducer 3 <- Reducer 2 (SORT, 1)
 #### A masked pattern was here ####
       Vertices:
@@ -569,7 +569,7 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 5 <- Map 4 (GROUP, 1)
+        Reducer 5 <- Map 4 (GROUP, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 4 
@@ -618,7 +618,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 3)
         Reducer 3 <- Reducer 2 (SORT, 1)
 #### A masked pattern was here ####
       Vertices:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_rollup1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_rollup1.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_rollup1.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_rollup1.q.out Fri Nov 28 04:59:50 2014
@@ -116,7 +116,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -193,8 +193,8 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 1)
-        Reducer 3 <- Reducer 2 (GROUP PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 3)
+        Reducer 3 <- Reducer 2 (GROUP PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -292,7 +292,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -392,10 +392,10 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 2 <- Map 6 (GROUP PARTITION-LEVEL SORT, 1)
-        Reducer 4 <- Map 7 (GROUP PARTITION-LEVEL SORT, 1)
-        Reducer 3 <- Reducer 2 (GROUP PARTITION-LEVEL SORT, 1)
-        Reducer 5 <- Reducer 4 (GROUP PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 6 (GROUP PARTITION-LEVEL SORT, 3)
+        Reducer 4 <- Map 7 (GROUP PARTITION-LEVEL SORT, 3)
+        Reducer 3 <- Reducer 2 (GROUP PARTITION-LEVEL SORT, 3)
+        Reducer 5 <- Reducer 4 (GROUP PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 6 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
Files hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out (original) and hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out Fri Nov 28 04:59:50 2014 differ

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
Files hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out (original) and hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out Fri Nov 28 04:59:50 2014 differ

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/having.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/having.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/having.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/having.q.out Fri Nov 28 04:59:50 2014
@@ -95,7 +95,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
+        Reducer 2 <- Map 1 (GROUP, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -476,7 +476,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
+        Reducer 2 <- Map 1 (GROUP, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -748,7 +748,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
+        Reducer 2 <- Map 1 (GROUP, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -949,7 +949,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
+        Reducer 2 <- Map 1 (GROUP, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -1221,7 +1221,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
+        Reducer 2 <- Map 1 (GROUP, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join20.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join20.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join20.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join20.q.out Fri Nov 28 04:59:50 2014
@@ -751,7 +751,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (SORT, 1)
+        Reducer 3 <- Map 2 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 2 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join38.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join38.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join38.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join38.q.out Fri Nov 28 04:59:50 2014
@@ -79,7 +79,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (GROUP, 1)
+        Reducer 3 <- Map 2 (GROUP, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 2 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join40.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join40.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join40.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join40.q.out Fri Nov 28 04:59:50 2014
@@ -1843,7 +1843,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (SORT, 1)
+        Reducer 3 <- Map 2 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 2 
@@ -2528,7 +2528,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (SORT, 1)
+        Reducer 3 <- Map 2 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 2 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join_filters_overlap.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join_filters_overlap.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
Files hive/branches/spark/ql/src/test/results/clientpositive/spark/join_filters_overlap.q.out (original) and hive/branches/spark/ql/src/test/results/clientpositive/spark/join_filters_overlap.q.out Fri Nov 28 04:59:50 2014 differ

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/join_reorder.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/join_reorder.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/join_reorder.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/join_reorder.q.out Fri Nov 28 04:59:50 2014
@@ -46,10 +46,14 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH 
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@t3
-PREHOOK: query: EXPLAIN FROM T1 a JOIN src c ON c.key+1=a.key
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN FROM T1 a JOIN src c ON c.key+1=a.key
 SELECT a.key, a.val, c.key
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN FROM T1 a JOIN src c ON c.key+1=a.key
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN FROM T1 a JOIN src c ON c.key+1=a.key
 SELECT a.key, a.val, c.key
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -475,9 +479,9 @@ POSTHOOK: Input: default@t2
 POSTHOOK: Input: default@t3
 #### A masked pattern was here ####
 2	2	12	12
+7	NULL	17	17
 NULL	NULL	NULL	14
 NULL	NULL	NULL	16
-7	NULL	17	17
 PREHOOK: query: FROM T1 a
   LEFT OUTER JOIN T2 b ON (b.key=a.key)
   RIGHT OUTER JOIN T3 c ON (c.val = a.val)
@@ -497,9 +501,9 @@ POSTHOOK: Input: default@t2
 POSTHOOK: Input: default@t3
 #### A masked pattern was here ####
 2	2	12	12
+7	NULL	17	17
 NULL	NULL	NULL	14
 NULL	NULL	NULL	16
-7	NULL	17	17
 PREHOOK: query: EXPLAIN FROM UNIQUEJOIN
   PRESERVE T1 a (a.key, a.val),
   PRESERVE T2 b (b.key, b.val),
@@ -520,7 +524,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1), Map 4 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 3 (PARTITION-LEVEL SORT, 3), Map 4 (PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -604,7 +608,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1), Map 4 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 3 (PARTITION-LEVEL SORT, 3), Map 4 (PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -690,15 +694,15 @@ POSTHOOK: Input: default@t3
 #### A masked pattern was here ####
 1	NULL	NULL
 2	NULL	2
-NULL	2	NULL
 3	3	NULL
-NULL	4	4
-NULL	5	NULL
-NULL	NULL	6
 7	NULL	7
 8	8	NULL
 8	8	NULL
 8	NULL	NULL
+NULL	2	NULL
+NULL	4	4
+NULL	5	NULL
+NULL	NULL	6
 PREHOOK: query: FROM UNIQUEJOIN
   PRESERVE T1 a (a.key, a.val),
   PRESERVE T2 b (b.key, b.val),
@@ -721,12 +725,12 @@ POSTHOOK: Input: default@t3
 #### A masked pattern was here ####
 1	NULL	NULL
 2	NULL	2
-NULL	2	NULL
 3	3	NULL
-NULL	4	4
-NULL	5	NULL
-NULL	NULL	6
 7	NULL	7
 8	8	NULL
 8	8	NULL
 8	NULL	NULL
+NULL	2	NULL
+NULL	4	4
+NULL	5	NULL
+NULL	NULL	6

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/limit_pushdown.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/limit_pushdown.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/limit_pushdown.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/limit_pushdown.q.out Fri Nov 28 04:59:50 2014
@@ -173,10 +173,10 @@ POSTHOOK: Input: default@src
 98	val_98
 98	val_98
 PREHOOK: query: explain
-select value, sum(key + 1) as sum from src group by value limit 20
+select value, sum(key + 1) as sum from src group by value order by value limit 20
 PREHOOK: type: QUERY
 POSTHOOK: query: explain
-select value, sum(key + 1) as sum from src group by value limit 20
+select value, sum(key + 1) as sum from src group by value order by value limit 20
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -186,7 +186,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
+        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 1)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -240,11 +240,11 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: select value, sum(key + 1) as sum from src group by value limit 20
+PREHOOK: query: select value, sum(key + 1) as sum from src group by value order by value limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: select value, sum(key + 1) as sum from src group by value limit 20
+POSTHOOK: query: select value, sum(key + 1) as sum from src group by value order by value limit 20
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
@@ -382,7 +382,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
+        Reducer 2 <- Map 1 (GROUP, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -462,10 +462,10 @@ POSTHOOK: Input: default@alltypesorc
 -16379.0
 NULL
 PREHOOK: query: explain
-select ctinyint, count(distinct(cdouble)) from alltypesorc group by ctinyint limit 20
+select ctinyint, count(distinct(cdouble)) from alltypesorc group by ctinyint order by ctinyint limit 20
 PREHOOK: type: QUERY
 POSTHOOK: query: explain
-select ctinyint, count(distinct(cdouble)) from alltypesorc group by ctinyint limit 20
+select ctinyint, count(distinct(cdouble)) from alltypesorc group by ctinyint order by ctinyint limit 20
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -528,11 +528,11 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: select ctinyint, count(distinct(cdouble)) from alltypesorc group by ctinyint limit 20
+PREHOOK: query: select ctinyint, count(distinct(cdouble)) from alltypesorc group by ctinyint order by ctinyint limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
-POSTHOOK: query: select ctinyint, count(distinct(cdouble)) from alltypesorc group by ctinyint limit 20
+POSTHOOK: query: select ctinyint, count(distinct(cdouble)) from alltypesorc group by ctinyint order by ctinyint limit 20
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
@@ -558,11 +558,11 @@ POSTHOOK: Input: default@alltypesorc
 NULL	2932
 PREHOOK: query: -- multi distinct
 explain
-select ctinyint, count(distinct(cstring1)), count(distinct(cstring2)) from alltypesorc group by ctinyint limit 20
+select ctinyint, count(distinct(cstring1)), count(distinct(cstring2)) from alltypesorc group by ctinyint order by ctinyint limit 20
 PREHOOK: type: QUERY
 POSTHOOK: query: -- multi distinct
 explain
-select ctinyint, count(distinct(cstring1)), count(distinct(cstring2)) from alltypesorc group by ctinyint limit 20
+select ctinyint, count(distinct(cstring1)), count(distinct(cstring2)) from alltypesorc group by ctinyint order by ctinyint limit 20
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -625,11 +625,11 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: select ctinyint, count(distinct(cstring1)), count(distinct(cstring2)) from alltypesorc group by ctinyint limit 20
+PREHOOK: query: select ctinyint, count(distinct(cstring1)), count(distinct(cstring2)) from alltypesorc group by ctinyint order by ctinyint limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
-POSTHOOK: query: select ctinyint, count(distinct(cstring1)), count(distinct(cstring2)) from alltypesorc group by ctinyint limit 20
+POSTHOOK: query: select ctinyint, count(distinct(cstring1)), count(distinct(cstring2)) from alltypesorc group by ctinyint order by ctinyint limit 20
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
@@ -695,7 +695,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
+        Reducer 2 <- Map 1 (GROUP, 3)
         Reducer 3 <- Reducer 2 (SORT, 1)
 #### A masked pattern was here ####
       Vertices:
@@ -870,7 +870,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 4 <- Map 3 (GROUP, 1)
+        Reducer 4 <- Map 3 (GROUP, 3)
         Reducer 5 <- Reducer 4 (GROUP, 1)
 #### A masked pattern was here ####
       Vertices:
@@ -966,11 +966,11 @@ STAGE PLANS:
 
 PREHOOK: query: -- map aggregation disabled
 explain
-select value, sum(key) as sum from src group by value limit 20
+select value, sum(key) as sum from src group by value order by value limit 20
 PREHOOK: type: QUERY
 POSTHOOK: query: -- map aggregation disabled
 explain
-select value, sum(key) as sum from src group by value limit 20
+select value, sum(key) as sum from src group by value order by value limit 20
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -980,7 +980,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
+        Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 1)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -1028,20 +1028,23 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: select value, sum(key) as sum from src group by value limit 20
+PREHOOK: query: select value, sum(key) as sum from src group by value order by value limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: select value, sum(key) as sum from src group by value limit 20
+POSTHOOK: query: select value, sum(key) as sum from src group by value order by value limit 20
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
+val_0	0.0
 val_10	10.0
 val_100	200.0
 val_103	206.0
+val_104	208.0
 val_105	105.0
 val_11	11.0
 val_111	111.0
+val_113	226.0
 val_114	114.0
 val_116	116.0
 val_118	236.0
@@ -1049,13 +1052,10 @@ val_119	357.0
 val_12	24.0
 val_120	240.0
 val_125	250.0
+val_126	126.0
 val_128	384.0
+val_129	258.0
 val_131	131.0
-val_137	137.0
-val_138	414.0
-val_15	15.0
-val_174	174.0
-val_193	193.0
 PREHOOK: query: -- flush for order-by
 explain
 select key,value,value,value,value,value,value,value,value from src order by key limit 100
@@ -1237,7 +1237,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
+        Reducer 2 <- Map 1 (GROUP, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -1293,103 +1293,103 @@ POSTHOOK: query: select sum(key) as sum 
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
-0.0
 10.0
 105.0
-11.0
-111.0
+1107.0
 114.0
+1227.0
+1251.0
 126.0
-131.0
+1314.0
 133.0
 136.0
 143.0
 145.0
-150.0
+1494.0
+15.0
 153.0
 155.0
-156.0
-157.0
-158.0
-160.0
-162.0
 163.0
 166.0
 17.0
-170.0
-177.0
-178.0
-180.0
-181.0
 183.0
-186.0
-189.0
-19.0
-192.0
+1872.0
+194.0
 194.0
-196.0
-20.0
-200.0
+1956.0
 201.0
 202.0
-206.0
+208.0
+210.0
 214.0
 222.0
 226.0
-226.0
-228.0
-24.0
-24.0
-240.0
-242.0
+2345.0
+241.0
 250.0
-258.0
+252.0
+262.0
+263.0
 268.0
-272.0
-273.0
-274.0
-280.0
-282.0
-298.0
-304.0
-309.0
-316.0
-327.0
+283.0
+291.0
+292.0
+30.0
+310.0
 328.0
+33.0
 330.0
-348.0
+339.0
+341.0
 348.0
 350.0
-352.0
-357.0
-358.0
-36.0
-382.0
-384.0
+351.0
+360.0
+379.0
+389.0
 390.0
-394.0
-399.0
-400.0
+4.0
 406.0
-417.0
+41.0
 418.0
+419.0
 426.0
-430.0
-432.0
+437.0
 442.0
 446.0
 448.0
-458.0
-459.0
+448.0
+449.0
+457.0
 466.0
-469.0
-474.0
-478.0
-489.0
-552.0
-561.0
+467.0
+477.0
+479.0
+484.0
+487.0
+496.0
+497.0
+53.0
+544.0
+562.0
+564.0
+57.0
 579.0
-597.0
-622.0
-624.0
-636.0
+618.0
+642.0
+65.0
+662.0
+69.0
+74.0
+77.0
+798.0
+819.0
+82.0
+84.0
+85.0
+858.0
+878.0
+916.0
+918.0
+933.0
+956.0

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/mapjoin_distinct.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/mapjoin_distinct.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/mapjoin_distinct.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/mapjoin_distinct.q.out Fri Nov 28 04:59:50 2014
@@ -190,7 +190,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (GROUP, 1)
+        Reducer 3 <- Map 2 (GROUP, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 2 
@@ -326,8 +326,8 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (GROUP PARTITION-LEVEL SORT, 1)
-        Reducer 4 <- Reducer 3 (GROUP, 1)
+        Reducer 3 <- Map 2 (GROUP PARTITION-LEVEL SORT, 3)
+        Reducer 4 <- Reducer 3 (GROUP, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 2 
@@ -470,7 +470,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (GROUP, 1)
+        Reducer 3 <- Map 2 (GROUP, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 2 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/mapjoin_filter_on_outerjoin.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/mapjoin_filter_on_outerjoin.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/mapjoin_filter_on_outerjoin.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/mapjoin_filter_on_outerjoin.q.out Fri Nov 28 04:59:50 2014
@@ -112,7 +112,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (SORT, 1)
+        Reducer 3 <- Map 2 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 2 
@@ -285,7 +285,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (SORT, 1)
+        Reducer 3 <- Map 2 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 2 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/mapjoin_test_outer.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/mapjoin_test_outer.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/mapjoin_test_outer.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/mapjoin_test_outer.q.out Fri Nov 28 04:59:50 2014
@@ -289,7 +289,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -1131,7 +1131,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/mapreduce2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/mapreduce2.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/mapreduce2.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/mapreduce2.q.out Fri Nov 28 04:59:50 2014
@@ -101,11 +101,11 @@ POSTHOOK: Lineage: dest1.key SCRIPT [(sr
 POSTHOOK: Lineage: dest1.one SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: dest1.ten 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 * FROM (SELECT dest1.* FROM dest1 DISTRIBUTE BY key SORT BY key, ten, one, value) T
+PREHOOK: query: SELECT * FROM (SELECT dest1.* FROM dest1 DISTRIBUTE BY key SORT BY key, ten, one, value) T ORDER BY key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest1
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM (SELECT dest1.* FROM dest1 DISTRIBUTE BY key SORT BY key, ten, one, value) T
+POSTHOOK: query: SELECT * FROM (SELECT dest1.* FROM dest1 DISTRIBUTE BY key SORT BY key, ten, one, value) T ORDER BY key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert.q.out Fri Nov 28 04:59:50 2014
@@ -587,7 +587,7 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -745,7 +745,7 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -903,7 +903,7 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -1061,7 +1061,7 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert_gby.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert_gby.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert_gby.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert_gby.q.out Fri Nov 28 04:59:50 2014
@@ -234,7 +234,7 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert_gby3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert_gby3.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert_gby3.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert_gby3.q.out Fri Nov 28 04:59:50 2014
@@ -1,8 +1,10 @@
-PREHOOK: query: create table e1 (key string, keyD double)
+PREHOOK: query: -- SORT_QUERY_RESULTS
+create table e1 (key string, keyD double)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@e1
-POSTHOOK: query: create table e1 (key string, keyD double)
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+create table e1 (key string, keyD double)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@e1
@@ -1605,8 +1607,8 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 2 <- Map 4 (GROUP PARTITION-LEVEL SORT, 1)
-        Reducer 3 <- Map 5 (GROUP PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 4 (GROUP PARTITION-LEVEL SORT, 3)
+        Reducer 3 <- Map 5 (GROUP PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 4 
@@ -1748,7 +1750,7 @@ STAGE PLANS:
     Spark
       Edges:
         Reducer 2 <- Map 1 (SORT, 1)
-        Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 1)
+        Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert_lateral_view.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert_lateral_view.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert_lateral_view.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert_lateral_view.q.out Fri Nov 28 04:59:50 2014
@@ -291,8 +291,8 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 2 <- Map 4 (GROUP, 1)
-        Reducer 3 <- Map 5 (GROUP, 1)
+        Reducer 2 <- Map 4 (GROUP, 3)
+        Reducer 3 <- Map 5 (GROUP, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 4 
@@ -563,8 +563,8 @@ STAGE PLANS:
   Stage: Stage-3
     Spark
       Edges:
-        Reducer 2 <- Map 4 (GROUP, 1)
-        Reducer 3 <- Map 5 (SORT, 1)
+        Reducer 2 <- Map 4 (GROUP, 3)
+        Reducer 3 <- Map 5 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 4 
@@ -854,9 +854,9 @@ STAGE PLANS:
   Stage: Stage-3
     Spark
       Edges:
-        Reducer 2 <- Map 5 (GROUP PARTITION-LEVEL SORT, 1)
-        Reducer 3 <- Map 6 (GROUP PARTITION-LEVEL SORT, 1)
-        Reducer 4 <- Map 7 (GROUP PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 5 (GROUP PARTITION-LEVEL SORT, 3)
+        Reducer 3 <- Map 6 (GROUP PARTITION-LEVEL SORT, 3)
+        Reducer 4 <- Map 7 (GROUP PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 5 
@@ -1224,9 +1224,9 @@ STAGE PLANS:
   Stage: Stage-4
     Spark
       Edges:
-        Reducer 2 <- Map 5 (GROUP PARTITION-LEVEL SORT, 1)
-        Reducer 3 <- Map 6 (GROUP PARTITION-LEVEL SORT, 1)
-        Reducer 4 <- Map 7 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 5 (GROUP PARTITION-LEVEL SORT, 3)
+        Reducer 3 <- Map 6 (GROUP PARTITION-LEVEL SORT, 3)
+        Reducer 4 <- Map 7 (PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 5 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert_move_tasks_share_dependencies.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert_move_tasks_share_dependencies.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert_move_tasks_share_dependencies.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert_move_tasks_share_dependencies.q.out Fri Nov 28 04:59:50 2014
@@ -604,7 +604,7 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -766,7 +766,7 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -928,7 +928,7 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -1090,7 +1090,7 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -2417,10 +2417,10 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 5 <- Map 1 (SORT, 1)
-        Reducer 6 <- Map 1 (SORT, 1)
-        Reducer 3 <- Reducer 5 (SORT, 1)
-        Reducer 4 <- Reducer 6 (SORT, 1)
+        Reducer 5 <- Map 1 (SORT, 3)
+        Reducer 6 <- Map 1 (SORT, 3)
+        Reducer 3 <- Reducer 5 (SORT, 3)
+        Reducer 4 <- Reducer 6 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -2556,10 +2556,10 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 5 <- Map 1 (SORT, 1)
-        Reducer 6 <- Map 1 (SORT, 1)
-        Reducer 3 <- Reducer 5 (SORT, 1)
-        Reducer 4 <- Reducer 6 (SORT, 1)
+        Reducer 5 <- Map 1 (SORT, 3)
+        Reducer 6 <- Map 1 (SORT, 3)
+        Reducer 3 <- Reducer 5 (SORT, 3)
+        Reducer 4 <- Reducer 6 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -2695,10 +2695,10 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 5 <- Map 1 (SORT, 1)
-        Reducer 6 <- Map 1 (SORT, 1)
-        Reducer 3 <- Reducer 5 (SORT, 1)
-        Reducer 4 <- Reducer 6 (SORT, 1)
+        Reducer 5 <- Map 1 (SORT, 3)
+        Reducer 6 <- Map 1 (SORT, 3)
+        Reducer 3 <- Reducer 5 (SORT, 3)
+        Reducer 4 <- Reducer 6 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -2834,10 +2834,10 @@ STAGE PLANS:
   Stage: Stage-2
     Spark
       Edges:
-        Reducer 5 <- Map 1 (SORT, 1)
-        Reducer 6 <- Map 1 (SORT, 1)
-        Reducer 3 <- Reducer 5 (SORT, 1)
-        Reducer 4 <- Reducer 6 (SORT, 1)
+        Reducer 5 <- Map 1 (SORT, 3)
+        Reducer 6 <- Map 1 (SORT, 3)
+        Reducer 3 <- Reducer 5 (SORT, 3)
+        Reducer 4 <- Reducer 6 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -2981,10 +2981,10 @@ STAGE PLANS:
   Stage: Stage-4
     Spark
       Edges:
-        Reducer 5 <- Map 1 (SORT, 1)
-        Reducer 6 <- Map 1 (SORT, 1)
-        Reducer 3 <- Reducer 5 (SORT, 1)
-        Reducer 4 <- Reducer 6 (SORT, 1)
+        Reducer 5 <- Map 1 (SORT, 3)
+        Reducer 6 <- Map 1 (SORT, 3)
+        Reducer 3 <- Reducer 5 (SORT, 3)
+        Reducer 4 <- Reducer 6 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -3231,10 +3231,10 @@ STAGE PLANS:
   Stage: Stage-4
     Spark
       Edges:
-        Reducer 5 <- Map 1 (SORT, 1)
-        Reducer 6 <- Map 1 (SORT, 1)
-        Reducer 3 <- Reducer 5 (SORT, 1)
-        Reducer 4 <- Reducer 6 (SORT, 1)
+        Reducer 5 <- Map 1 (SORT, 3)
+        Reducer 6 <- Map 1 (SORT, 3)
+        Reducer 3 <- Reducer 5 (SORT, 3)
+        Reducer 4 <- Reducer 6 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -3481,10 +3481,10 @@ STAGE PLANS:
   Stage: Stage-4
     Spark
       Edges:
-        Reducer 5 <- Map 1 (SORT, 1)
-        Reducer 6 <- Map 1 (SORT, 1)
-        Reducer 3 <- Reducer 5 (SORT, 1)
-        Reducer 4 <- Reducer 6 (SORT, 1)
+        Reducer 5 <- Map 1 (SORT, 3)
+        Reducer 6 <- Map 1 (SORT, 3)
+        Reducer 3 <- Reducer 5 (SORT, 3)
+        Reducer 4 <- Reducer 6 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -3731,10 +3731,10 @@ STAGE PLANS:
   Stage: Stage-4
     Spark
       Edges:
-        Reducer 5 <- Map 1 (SORT, 1)
-        Reducer 6 <- Map 1 (SORT, 1)
-        Reducer 3 <- Reducer 5 (SORT, 1)
-        Reducer 4 <- Reducer 6 (SORT, 1)
+        Reducer 5 <- Map 1 (SORT, 3)
+        Reducer 6 <- Map 1 (SORT, 3)
+        Reducer 3 <- Reducer 5 (SORT, 3)
+        Reducer 4 <- Reducer 6 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_join_union.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_join_union.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_join_union.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_join_union.q.out Fri Nov 28 04:59:50 2014
@@ -1,9 +1,13 @@
-PREHOOK: query: CREATE TABLE src11 as SELECT * FROM src
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE src11 as SELECT * FROM src
 PREHOOK: type: CREATETABLE_AS_SELECT
 PREHOOK: Input: default@src
 PREHOOK: Output: database:default
 PREHOOK: Output: default@src11
-POSTHOOK: query: CREATE TABLE src11 as SELECT * FROM src
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+CREATE TABLE src11 as SELECT * FROM src
 POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@src
 POSTHOOK: Output: database:default
@@ -79,7 +83,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 4 <- Map 5 (PARTITION-LEVEL SORT, 1), Union 3 (PARTITION-LEVEL SORT, 1)
+        Reducer 4 <- Map 5 (PARTITION-LEVEL SORT, 3), Union 3 (PARTITION-LEVEL SORT, 3)
         Union 3 <- Map 2 (NONE, 0), Map 6 (NONE, 0)
 #### A masked pattern was here ####
       Vertices:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
Files hive/branches/spark/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.out (original) and hive/branches/spark/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.out Fri Nov 28 04:59:50 2014 differ

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_join4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_join4.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_join4.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_join4.q.out Fri Nov 28 04:59:50 2014
@@ -75,7 +75,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (SORT, 1)
+        Reducer 3 <- Map 2 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 2 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
Files hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out (original) and hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out Fri Nov 28 04:59:50 2014 differ

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_outer_join3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_outer_join3.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_outer_join3.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_outer_join3.q.out Fri Nov 28 04:59:50 2014
@@ -1,4 +1,6 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
  FROM 
   src a
  FULL OUTER JOIN 
@@ -7,7 +9,9 @@ PREHOOK: query: EXPLAIN
  SELECT a.key, a.value, b.key, b.value
  WHERE a.key > '10' AND a.key < '20' AND b.key > '15' AND b.key < '25'
 PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+EXPLAIN
  FROM 
   src a
  FULL OUTER JOIN 
@@ -252,7 +256,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 3 (PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_transform.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_transform.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_transform.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_transform.q.out Fri Nov 28 04:59:50 2014
@@ -206,7 +206,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/ptf_decimal.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/ptf_decimal.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/ptf_decimal.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/ptf_decimal.q.out Fri Nov 28 04:59:50 2014
@@ -1,4 +1,6 @@
-PREHOOK: query: -- 1. aggregate functions with decimal type
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- 1. aggregate functions with decimal type
 
 select p_mfgr, p_retailprice,
 lead(p_retailprice) over (partition by p_mfgr ORDER BY p_name) as c1,
@@ -9,7 +11,9 @@ from part
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 1. aggregate functions with decimal type
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- 1. aggregate functions with decimal type
 
 select p_mfgr, p_retailprice,
 lead(p_retailprice) over (partition by p_mfgr ORDER BY p_name) as c1,
@@ -22,30 +26,30 @@ POSTHOOK: Input: default@part
 #### A masked pattern was here ####
 Manufacturer#1	1173.15	1173.15	NULL	1173.15	1173.15
 Manufacturer#1	1173.15	1753.76	1173.15	1173.15	1173.15
-Manufacturer#1	1753.76	1602.59	1173.15	1173.15	1753.76
-Manufacturer#1	1602.59	1414.42	1753.76	1173.15	1602.59
 Manufacturer#1	1414.42	1632.66	1602.59	1173.15	1414.42
+Manufacturer#1	1602.59	1414.42	1753.76	1173.15	1602.59
 Manufacturer#1	1632.66	NULL	1414.42	1173.15	1632.66
+Manufacturer#1	1753.76	1602.59	1173.15	1173.15	1753.76
 Manufacturer#2	1690.68	1800.7	NULL	1690.68	1690.68
-Manufacturer#2	1800.7	2031.98	1690.68	1690.68	1800.7
-Manufacturer#2	2031.98	1698.66	1800.7	1690.68	2031.98
 Manufacturer#2	1698.66	1701.6	2031.98	1690.68	1698.66
 Manufacturer#2	1701.6	NULL	1698.66	1690.68	1701.6
-Manufacturer#3	1671.68	1190.27	NULL	1671.68	1671.68
+Manufacturer#2	1800.7	2031.98	1690.68	1690.68	1800.7
+Manufacturer#2	2031.98	1698.66	1800.7	1690.68	2031.98
 Manufacturer#3	1190.27	1410.39	1671.68	1671.68	1190.27
+Manufacturer#3	1337.29	NULL	1922.98	1671.68	1337.29
 Manufacturer#3	1410.39	1922.98	1190.27	1671.68	1410.39
+Manufacturer#3	1671.68	1190.27	NULL	1671.68	1671.68
 Manufacturer#3	1922.98	1337.29	1410.39	1671.68	1922.98
-Manufacturer#3	1337.29	NULL	1922.98	1671.68	1337.29
-Manufacturer#4	1620.67	1375.42	NULL	1620.67	1620.67
-Manufacturer#4	1375.42	1206.26	1620.67	1620.67	1375.42
 Manufacturer#4	1206.26	1844.92	1375.42	1620.67	1206.26
-Manufacturer#4	1844.92	1290.35	1206.26	1620.67	1844.92
 Manufacturer#4	1290.35	NULL	1844.92	1620.67	1290.35
-Manufacturer#5	1789.69	1611.66	NULL	1789.69	1789.69
-Manufacturer#5	1611.66	1788.73	1789.69	1789.69	1611.66
-Manufacturer#5	1788.73	1018.1	1611.66	1789.69	1788.73
+Manufacturer#4	1375.42	1206.26	1620.67	1620.67	1375.42
+Manufacturer#4	1620.67	1375.42	NULL	1620.67	1620.67
+Manufacturer#4	1844.92	1290.35	1206.26	1620.67	1844.92
 Manufacturer#5	1018.1	1464.48	1788.73	1789.69	1018.1
 Manufacturer#5	1464.48	NULL	1018.1	1789.69	1464.48
+Manufacturer#5	1611.66	1788.73	1789.69	1789.69	1611.66
+Manufacturer#5	1788.73	1018.1	1611.66	1789.69	1788.73
+Manufacturer#5	1789.69	1611.66	NULL	1789.69	1789.69
 PREHOOK: query: -- 2. ranking functions with decimal type
 
 select p_mfgr, p_retailprice,
@@ -114,32 +118,32 @@ from part
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
-Manufacturer#1	1753.76	NULL
-Manufacturer#1	1632.66	1753.76
-Manufacturer#1	1602.59	1632.66
-Manufacturer#1	1414.42	1602.59
-Manufacturer#1	1173.15	1414.42
 Manufacturer#1	1173.15	1173.15
-Manufacturer#2	2031.98	NULL
-Manufacturer#2	1800.7	2031.98
-Manufacturer#2	1701.6	1800.7
-Manufacturer#2	1698.66	1701.6
+Manufacturer#1	1173.15	1414.42
+Manufacturer#1	1414.42	1602.59
+Manufacturer#1	1602.59	1632.66
+Manufacturer#1	1632.66	1753.76
+Manufacturer#1	1753.76	NULL
 Manufacturer#2	1690.68	1698.66
-Manufacturer#3	1922.98	NULL
-Manufacturer#3	1671.68	1922.98
-Manufacturer#3	1410.39	1671.68
-Manufacturer#3	1337.29	1410.39
+Manufacturer#2	1698.66	1701.6
+Manufacturer#2	1701.6	1800.7
+Manufacturer#2	1800.7	2031.98
+Manufacturer#2	2031.98	NULL
 Manufacturer#3	1190.27	1337.29
-Manufacturer#4	1844.92	NULL
-Manufacturer#4	1620.67	1844.92
-Manufacturer#4	1375.42	1620.67
-Manufacturer#4	1290.35	1375.42
+Manufacturer#3	1337.29	1410.39
+Manufacturer#3	1410.39	1671.68
+Manufacturer#3	1671.68	1922.98
+Manufacturer#3	1922.98	NULL
 Manufacturer#4	1206.26	1290.35
-Manufacturer#5	1789.69	NULL
-Manufacturer#5	1788.73	1789.69
-Manufacturer#5	1611.66	1788.73
-Manufacturer#5	1464.48	1611.66
+Manufacturer#4	1290.35	1375.42
+Manufacturer#4	1375.42	1620.67
+Manufacturer#4	1620.67	1844.92
+Manufacturer#4	1844.92	NULL
 Manufacturer#5	1018.1	1464.48
+Manufacturer#5	1464.48	1611.66
+Manufacturer#5	1611.66	1788.73
+Manufacturer#5	1788.73	1789.69
+Manufacturer#5	1789.69	NULL
 PREHOOK: query: -- 4. partition by decimal
 
 select p_mfgr, p_retailprice,
@@ -156,29 +160,29 @@ from part
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
-Manufacturer#5	1018.1	NULL
-Manufacturer#1	1173.15	NULL
 Manufacturer#1	1173.15	1173.15
-Manufacturer#3	1190.27	NULL
-Manufacturer#4	1206.26	NULL
-Manufacturer#4	1290.35	NULL
-Manufacturer#3	1337.29	NULL
-Manufacturer#4	1375.42	NULL
-Manufacturer#3	1410.39	NULL
+Manufacturer#1	1173.15	NULL
 Manufacturer#1	1414.42	NULL
-Manufacturer#5	1464.48	NULL
 Manufacturer#1	1602.59	NULL
-Manufacturer#5	1611.66	NULL
-Manufacturer#4	1620.67	NULL
 Manufacturer#1	1632.66	NULL
-Manufacturer#3	1671.68	NULL
+Manufacturer#1	1753.76	NULL
 Manufacturer#2	1690.68	NULL
 Manufacturer#2	1698.66	NULL
 Manufacturer#2	1701.6	NULL
-Manufacturer#1	1753.76	NULL
-Manufacturer#5	1788.73	NULL
-Manufacturer#5	1789.69	NULL
 Manufacturer#2	1800.7	NULL
-Manufacturer#4	1844.92	NULL
-Manufacturer#3	1922.98	NULL
 Manufacturer#2	2031.98	NULL
+Manufacturer#3	1190.27	NULL
+Manufacturer#3	1337.29	NULL
+Manufacturer#3	1410.39	NULL
+Manufacturer#3	1671.68	NULL
+Manufacturer#3	1922.98	NULL
+Manufacturer#4	1206.26	NULL
+Manufacturer#4	1290.35	NULL
+Manufacturer#4	1375.42	NULL
+Manufacturer#4	1620.67	NULL
+Manufacturer#4	1844.92	NULL
+Manufacturer#5	1018.1	NULL
+Manufacturer#5	1464.48	NULL
+Manufacturer#5	1611.66	NULL
+Manufacturer#5	1788.73	NULL
+Manufacturer#5	1789.69	NULL

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/ptf_general_queries.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/ptf_general_queries.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/ptf_general_queries.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/ptf_general_queries.q.out Fri Nov 28 04:59:50 2014
@@ -1,4 +1,6 @@
-PREHOOK: query: -- 1. testNoPTFNoWindowing
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- 1. testNoPTFNoWindowing
 select p_mfgr, p_name, p_size
 from part
 distribute by p_mfgr
@@ -6,7 +8,9 @@ sort by p_name
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 1. testNoPTFNoWindowing
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- 1. testNoPTFNoWindowing
 select p_mfgr, p_name, p_size
 from part
 distribute by p_mfgr
@@ -14,31 +18,31 @@ sort by p_name
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
-Manufacturer#5	almond antique blue firebrick mint	31
 Manufacturer#1	almond antique burnished rose metallic	2
 Manufacturer#1	almond antique burnished rose metallic	2
-Manufacturer#3	almond antique chartreuse khaki white	17
 Manufacturer#1	almond antique chartreuse lavender yellow	34
-Manufacturer#3	almond antique forest lavender goldenrod	14
-Manufacturer#4	almond antique gainsboro frosted violet	10
-Manufacturer#5	almond antique medium spring khaki	6
-Manufacturer#3	almond antique metallic orange dim	19
-Manufacturer#3	almond antique misty red olive	1
-Manufacturer#3	almond antique olive coral navajo	45
 Manufacturer#1	almond antique salmon chartreuse burlywood	6
-Manufacturer#5	almond antique sky peru orange	2
+Manufacturer#1	almond aquamarine burnished black steel	28
+Manufacturer#1	almond aquamarine pink moccasin thistle	42
 Manufacturer#2	almond antique violet chocolate turquoise	14
-Manufacturer#4	almond antique violet mint lemon	39
 Manufacturer#2	almond antique violet turquoise frosted	40
-Manufacturer#1	almond aquamarine burnished black steel	28
-Manufacturer#5	almond aquamarine dodger light gainsboro	46
-Manufacturer#4	almond aquamarine floral ivory bisque	27
 Manufacturer#2	almond aquamarine midnight light salmon	2
-Manufacturer#1	almond aquamarine pink moccasin thistle	42
 Manufacturer#2	almond aquamarine rose maroon antique	25
 Manufacturer#2	almond aquamarine sandy cyan gainsboro	18
+Manufacturer#3	almond antique chartreuse khaki white	17
+Manufacturer#3	almond antique forest lavender goldenrod	14
+Manufacturer#3	almond antique metallic orange dim	19
+Manufacturer#3	almond antique misty red olive	1
+Manufacturer#3	almond antique olive coral navajo	45
+Manufacturer#4	almond antique gainsboro frosted violet	10
+Manufacturer#4	almond antique violet mint lemon	39
+Manufacturer#4	almond aquamarine floral ivory bisque	27
 Manufacturer#4	almond aquamarine yellow dodger mint	7
 Manufacturer#4	almond azure aquamarine papaya violet	12
+Manufacturer#5	almond antique blue firebrick mint	31
+Manufacturer#5	almond antique medium spring khaki	6
+Manufacturer#5	almond antique sky peru orange	2
+Manufacturer#5	almond aquamarine dodger light gainsboro	46
 Manufacturer#5	almond azure blanched chiffon midnight	23
 PREHOOK: query: -- 2. testUDAFsNoWindowingNoPTFNoGBY
 select p_mfgr,p_name, p_retailprice,  

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/sample10.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/sample10.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
Files hive/branches/spark/ql/src/test/results/clientpositive/spark/sample10.q.out (original) and hive/branches/spark/ql/src/test/results/clientpositive/spark/sample10.q.out Fri Nov 28 04:59:50 2014 differ

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/semijoin.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/semijoin.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/semijoin.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/semijoin.q.out Fri Nov 28 04:59:50 2014
@@ -158,7 +158,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (SORT, 1)
+        Reducer 3 <- Map 2 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 2 
@@ -272,7 +272,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (SORT, 1)
+        Reducer 3 <- Map 2 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 2 
@@ -388,7 +388,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (SORT, 1)
+        Reducer 3 <- Map 2 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 2 
@@ -496,7 +496,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (SORT, 1)
+        Reducer 3 <- Map 2 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 2 
@@ -615,7 +615,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (SORT, 1)
+        Reducer 3 <- Map 2 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 2 
@@ -726,7 +726,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -837,7 +837,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (SORT, 1)
+        Reducer 3 <- Map 2 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 2 
@@ -945,7 +945,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (SORT, 1)
+        Reducer 3 <- Map 2 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 2 
@@ -1058,7 +1058,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (SORT, 1)
+        Reducer 3 <- Map 2 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 2 
@@ -1185,7 +1185,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (SORT, 1)
+        Reducer 3 <- Map 2 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 2 
@@ -1318,7 +1318,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -1447,7 +1447,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (SORT, 1)
+        Reducer 3 <- Map 2 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 2 
@@ -1599,7 +1599,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 4 <- Map 3 (SORT, 1)
+        Reducer 4 <- Map 3 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 3 
@@ -1742,7 +1742,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 4 <- Map 3 (SORT, 1)
+        Reducer 4 <- Map 3 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 3 
@@ -1894,7 +1894,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (SORT, 1)
+        Reducer 2 <- Map 1 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -2002,8 +2002,8 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 4 (PARTITION-LEVEL SORT, 1), Map 5 (PARTITION-LEVEL SORT, 1)
-        Reducer 3 <- Reducer 2 (SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 4 (PARTITION-LEVEL SORT, 3), Map 5 (PARTITION-LEVEL SORT, 3)
+        Reducer 3 <- Reducer 2 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -2185,7 +2185,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 4 <- Map 3 (SORT, 1)
+        Reducer 4 <- Map 3 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 3 
@@ -2340,7 +2340,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (SORT, 1)
+        Reducer 3 <- Map 2 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 2 
@@ -2450,8 +2450,8 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 4 (PARTITION-LEVEL SORT, 1), Map 5 (PARTITION-LEVEL SORT, 1)
-        Reducer 3 <- Reducer 2 (SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 4 (PARTITION-LEVEL SORT, 3), Map 5 (PARTITION-LEVEL SORT, 3)
+        Reducer 3 <- Reducer 2 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -2645,7 +2645,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 4 <- Map 3 (SORT, 1)
+        Reducer 4 <- Map 3 (SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 3 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt2.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt2.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt2.q.out Fri Nov 28 04:59:50 2014
@@ -399,7 +399,7 @@ STAGE PLANS:
     Spark
       Edges:
         Union 2 <- Map 1 (NONE, 0), Map 6 (NONE, 0)
-        Reducer 3 <- Union 2 (GROUP, 1)
+        Reducer 3 <- Union 2 (GROUP, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -573,7 +573,7 @@ STAGE PLANS:
     Spark
       Edges:
         Union 2 <- Map 1 (NONE, 0), Map 6 (NONE, 0)
-        Reducer 3 <- Union 2 (GROUP, 1)
+        Reducer 3 <- Union 2 (GROUP, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt3.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt3.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt3.q.out Fri Nov 28 04:59:50 2014
@@ -214,8 +214,8 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 4 (PARTITION-LEVEL SORT, 1)
-        Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 1), Map 7 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 4 (PARTITION-LEVEL SORT, 3)
+        Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 3), Map 7 (PARTITION-LEVEL SORT, 3)
         Union 3 <- Reducer 2 (NONE, 0), Reducer 6 (NONE, 0)
 #### A masked pattern was here ####
       Vertices:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt9.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt9.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt9.q.out Fri Nov 28 04:59:50 2014
@@ -225,7 +225,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
+        Reducer 2 <- Map 1 (GROUP, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_1.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_1.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_1.q.out Fri Nov 28 04:59:50 2014
@@ -46,10 +46,14 @@ POSTHOOK: query: load data local inpath 
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@smb_bucket_3
-PREHOOK: query: explain
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+explain
 select /*+mapjoin(a)*/ * from smb_bucket_1 a join smb_bucket_2 b on a.key = b.key
 PREHOOK: type: QUERY
-POSTHOOK: query: explain
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+explain
 select /*+mapjoin(a)*/ * from smb_bucket_1 a join smb_bucket_2 b on a.key = b.key
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -219,10 +223,10 @@ POSTHOOK: Input: default@smb_bucket_1
 POSTHOOK: Input: default@smb_bucket_2
 #### A masked pattern was here ####
 1	val_1	NULL	NULL
+10	val_10	NULL	NULL
 3	val_3	NULL	NULL
 4	val_4	NULL	NULL
 5	val_5	NULL	NULL
-10	val_10	NULL	NULL
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1 a right outer join smb_bucket_2 b on a.key = b.key
 PREHOOK: type: QUERY
@@ -324,7 +328,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 3 (PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -388,10 +392,10 @@ POSTHOOK: Input: default@smb_bucket_1
 POSTHOOK: Input: default@smb_bucket_2
 #### A masked pattern was here ####
 1	val_1	NULL	NULL
+10	val_10	NULL	NULL
 3	val_3	NULL	NULL
 4	val_4	NULL	NULL
 5	val_5	NULL	NULL
-10	val_10	NULL	NULL
 NULL	NULL	20	val_20
 NULL	NULL	23	val_23
 NULL	NULL	25	val_25
@@ -569,10 +573,10 @@ POSTHOOK: Input: default@smb_bucket_1
 POSTHOOK: Input: default@smb_bucket_2
 #### A masked pattern was here ####
 1	val_1	NULL	NULL
+10	val_10	NULL	NULL
 3	val_3	NULL	NULL
 4	val_4	NULL	NULL
 5	val_5	NULL	NULL
-10	val_10	NULL	NULL
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1 a right outer join smb_bucket_2 b on a.key = b.key
 PREHOOK: type: QUERY
@@ -674,7 +678,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 3 (PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -738,10 +742,10 @@ POSTHOOK: Input: default@smb_bucket_1
 POSTHOOK: Input: default@smb_bucket_2
 #### A masked pattern was here ####
 1	val_1	NULL	NULL
+10	val_10	NULL	NULL
 3	val_3	NULL	NULL
 4	val_4	NULL	NULL
 5	val_5	NULL	NULL
-10	val_10	NULL	NULL
 NULL	NULL	20	val_20
 NULL	NULL	23	val_23
 NULL	NULL	25	val_25

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_14.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_14.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_14.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_14.q.out Fri Nov 28 04:59:50 2014
@@ -208,7 +208,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
+        Reducer 2 <- Map 1 (GROUP, 3)
         Reducer 3 <- Reducer 2 (SORT, 1)
 #### A masked pattern was here ####
       Vertices:
@@ -367,7 +367,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (GROUP, 1)
+        Reducer 3 <- Map 2 (GROUP, 3)
         Reducer 4 <- Reducer 3 (GROUP, 1)
 #### A masked pattern was here ####
       Vertices:

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_17.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_17.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_17.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_17.q.out Fri Nov 28 04:59:50 2014
@@ -781,7 +781,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1), Map 4 (PARTITION-LEVEL SORT, 1), Map 5 (PARTITION-LEVEL SORT, 1), Map 6 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 3 (PARTITION-LEVEL SORT, 3), Map 4 (PARTITION-LEVEL SORT, 3), Map 5 (PARTITION-LEVEL SORT, 3), Map 6 (PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_2.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_2.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_2.q.out Fri Nov 28 04:59:50 2014
@@ -46,10 +46,14 @@ POSTHOOK: query: load data local inpath 
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@smb_bucket_3
-PREHOOK: query: explain
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+explain
 select /*+mapjoin(a)*/ * from smb_bucket_1 a join smb_bucket_3 b on a.key = b.key
 PREHOOK: type: QUERY
-POSTHOOK: query: explain
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+explain
 select /*+mapjoin(a)*/ * from smb_bucket_1 a join smb_bucket_3 b on a.key = b.key
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -135,8 +139,8 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@smb_bucket_1
 POSTHOOK: Input: default@smb_bucket_3
 #### A masked pattern was here ####
-4	val_4	4	val_4
 10	val_10	10	val_10
+4	val_4	4	val_4
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1 a left outer join smb_bucket_3 b on a.key = b.key
 PREHOOK: type: QUERY
@@ -221,10 +225,10 @@ POSTHOOK: Input: default@smb_bucket_1
 POSTHOOK: Input: default@smb_bucket_3
 #### A masked pattern was here ####
 1	val_1	NULL	NULL
+10	val_10	10	val_10
 3	val_3	NULL	NULL
 4	val_4	4	val_4
 5	val_5	NULL	NULL
-10	val_10	10	val_10
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_1 a right outer join smb_bucket_3 b on a.key = b.key
 PREHOOK: type: QUERY
@@ -308,8 +312,8 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@smb_bucket_1
 POSTHOOK: Input: default@smb_bucket_3
 #### A masked pattern was here ####
-4	val_4	4	val_4
 10	val_10	10	val_10
+4	val_4	4	val_4
 NULL	NULL	17	val_17
 NULL	NULL	19	val_19
 NULL	NULL	20	val_20
@@ -328,7 +332,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 3 (PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -392,10 +396,10 @@ POSTHOOK: Input: default@smb_bucket_1
 POSTHOOK: Input: default@smb_bucket_3
 #### A masked pattern was here ####
 1	val_1	NULL	NULL
+10	val_10	10	val_10
 3	val_3	NULL	NULL
 4	val_4	4	val_4
 5	val_5	NULL	NULL
-10	val_10	10	val_10
 NULL	NULL	17	val_17
 NULL	NULL	19	val_19
 NULL	NULL	20	val_20
@@ -489,8 +493,8 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@smb_bucket_1
 POSTHOOK: Input: default@smb_bucket_3
 #### A masked pattern was here ####
-4	val_4	4	val_4
 10	val_10	10	val_10
+4	val_4	4	val_4
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1 a left outer join smb_bucket_3 b on a.key = b.key
 PREHOOK: type: QUERY
@@ -575,10 +579,10 @@ POSTHOOK: Input: default@smb_bucket_1
 POSTHOOK: Input: default@smb_bucket_3
 #### A masked pattern was here ####
 1	val_1	NULL	NULL
+10	val_10	10	val_10
 3	val_3	NULL	NULL
 4	val_4	4	val_4
 5	val_5	NULL	NULL
-10	val_10	10	val_10
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_1 a right outer join smb_bucket_3 b on a.key = b.key
 PREHOOK: type: QUERY
@@ -662,8 +666,8 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@smb_bucket_1
 POSTHOOK: Input: default@smb_bucket_3
 #### A masked pattern was here ####
-4	val_4	4	val_4
 10	val_10	10	val_10
+4	val_4	4	val_4
 NULL	NULL	17	val_17
 NULL	NULL	19	val_19
 NULL	NULL	20	val_20
@@ -682,7 +686,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 3 (PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -746,10 +750,10 @@ POSTHOOK: Input: default@smb_bucket_1
 POSTHOOK: Input: default@smb_bucket_3
 #### A masked pattern was here ####
 1	val_1	NULL	NULL
+10	val_10	10	val_10
 3	val_3	NULL	NULL
 4	val_4	4	val_4
 5	val_5	NULL	NULL
-10	val_10	10	val_10
 NULL	NULL	17	val_17
 NULL	NULL	19	val_19
 NULL	NULL	20	val_20

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_3.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_3.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_3.q.out Fri Nov 28 04:59:50 2014
@@ -1,8 +1,16 @@
-PREHOOK: query: create table smb_bucket_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+
+
+create table smb_bucket_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@smb_bucket_1
-POSTHOOK: query: create table smb_bucket_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+
+
+create table smb_bucket_1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 1 BUCKETS STORED AS RCFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@smb_bucket_1
@@ -307,12 +315,12 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@smb_bucket_2
 POSTHOOK: Input: default@smb_bucket_3
 #### A masked pattern was here ####
-NULL	NULL	4	val_4
+20	val_20	20	val_20
+23	val_23	23	val_23
 NULL	NULL	10	val_10
 NULL	NULL	17	val_17
 NULL	NULL	19	val_19
-20	val_20	20	val_20
-23	val_23	23	val_23
+NULL	NULL	4	val_4
 PREHOOK: query: explain
 select /*+mapjoin(a)*/ * from smb_bucket_2 a full outer join smb_bucket_3 b on a.key = b.key
 PREHOOK: type: QUERY
@@ -327,7 +335,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 3 (PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -390,14 +398,14 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@smb_bucket_2
 POSTHOOK: Input: default@smb_bucket_3
 #### A masked pattern was here ####
-NULL	NULL	4	val_4
-NULL	NULL	10	val_10
-NULL	NULL	17	val_17
-NULL	NULL	19	val_19
 20	val_20	20	val_20
 23	val_23	23	val_23
 25	val_25	NULL	NULL
 30	val_30	NULL	NULL
+NULL	NULL	10	val_10
+NULL	NULL	17	val_17
+NULL	NULL	19	val_19
+NULL	NULL	4	val_4
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_2 a join smb_bucket_3 b on a.key = b.key
 PREHOOK: type: QUERY
@@ -659,12 +667,12 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@smb_bucket_2
 POSTHOOK: Input: default@smb_bucket_3
 #### A masked pattern was here ####
-NULL	NULL	4	val_4
+20	val_20	20	val_20
+23	val_23	23	val_23
 NULL	NULL	10	val_10
 NULL	NULL	17	val_17
 NULL	NULL	19	val_19
-20	val_20	20	val_20
-23	val_23	23	val_23
+NULL	NULL	4	val_4
 PREHOOK: query: explain
 select /*+mapjoin(b)*/ * from smb_bucket_2 a full outer join smb_bucket_3 b on a.key = b.key
 PREHOOK: type: QUERY
@@ -679,7 +687,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 3 (PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -742,11 +750,11 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@smb_bucket_2
 POSTHOOK: Input: default@smb_bucket_3
 #### A masked pattern was here ####
-NULL	NULL	4	val_4
-NULL	NULL	10	val_10
-NULL	NULL	17	val_17
-NULL	NULL	19	val_19
 20	val_20	20	val_20
 23	val_23	23	val_23
 25	val_25	NULL	NULL
 30	val_30	NULL	NULL
+NULL	NULL	10	val_10
+NULL	NULL	17	val_17
+NULL	NULL	19	val_19
+NULL	NULL	4	val_4

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_4.q.out?rev=1642263&r1=1642262&r2=1642263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_4.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_4.q.out Fri Nov 28 04:59:50 2014
@@ -46,10 +46,14 @@ POSTHOOK: query: load data local inpath 
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@smb_bucket_3
-PREHOOK: query: explain
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+explain
 select /*+mapjoin(a,b)*/ * from smb_bucket_1 a join smb_bucket_2 b on a.key = b.key join smb_bucket_3 c on b.key=c.key
 PREHOOK: type: QUERY
-POSTHOOK: query: explain
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+explain
 select /*+mapjoin(a,b)*/ * from smb_bucket_1 a join smb_bucket_2 b on a.key = b.key join smb_bucket_3 c on b.key=c.key
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
@@ -377,10 +381,10 @@ POSTHOOK: Input: default@smb_bucket_2
 POSTHOOK: Input: default@smb_bucket_3
 #### A masked pattern was here ####
 1	val_1	NULL	NULL	NULL	NULL
+10	val_10	NULL	NULL	NULL	NULL
 3	val_3	NULL	NULL	NULL	NULL
 4	val_4	NULL	NULL	NULL	NULL
 5	val_5	NULL	NULL	NULL	NULL
-10	val_10	NULL	NULL	NULL	NULL
 PREHOOK: query: explain
 select /*+mapjoin(a,b)*/ * from smb_bucket_1 a left outer join smb_bucket_2 b on a.key = b.key right outer join smb_bucket_3 c on b.key=c.key
 PREHOOK: type: QUERY
@@ -488,12 +492,12 @@ POSTHOOK: Input: default@smb_bucket_1
 POSTHOOK: Input: default@smb_bucket_2
 POSTHOOK: Input: default@smb_bucket_3
 #### A masked pattern was here ####
-NULL	NULL	NULL	NULL	4	val_4
 NULL	NULL	NULL	NULL	10	val_10
 NULL	NULL	NULL	NULL	17	val_17
 NULL	NULL	NULL	NULL	19	val_19
 NULL	NULL	NULL	NULL	20	val_20
 NULL	NULL	NULL	NULL	23	val_23
+NULL	NULL	NULL	NULL	4	val_4
 PREHOOK: query: explain
 select /*+mapjoin(a,b)*/ * from smb_bucket_1 a left outer join smb_bucket_2 b on a.key = b.key full outer join smb_bucket_3 c on b.key=c.key
 PREHOOK: type: QUERY
@@ -508,7 +512,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1), Map 4 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 3 (PARTITION-LEVEL SORT, 3), Map 4 (PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -587,16 +591,16 @@ POSTHOOK: Input: default@smb_bucket_2
 POSTHOOK: Input: default@smb_bucket_3
 #### A masked pattern was here ####
 1	val_1	NULL	NULL	NULL	NULL
+10	val_10	NULL	NULL	NULL	NULL
 3	val_3	NULL	NULL	NULL	NULL
 4	val_4	NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL	4	val_4
 5	val_5	NULL	NULL	NULL	NULL
-10	val_10	NULL	NULL	NULL	NULL
 NULL	NULL	NULL	NULL	10	val_10
 NULL	NULL	NULL	NULL	17	val_17
 NULL	NULL	NULL	NULL	19	val_19
 NULL	NULL	NULL	NULL	20	val_20
 NULL	NULL	NULL	NULL	23	val_23
+NULL	NULL	NULL	NULL	4	val_4
 PREHOOK: query: explain
 select /*+mapjoin(a,b)*/ * from smb_bucket_1 a right outer join smb_bucket_2 b on a.key = b.key join smb_bucket_3 c on b.key=c.key
 PREHOOK: type: QUERY
@@ -924,12 +928,12 @@ POSTHOOK: Input: default@smb_bucket_1
 POSTHOOK: Input: default@smb_bucket_2
 POSTHOOK: Input: default@smb_bucket_3
 #### A masked pattern was here ####
-NULL	NULL	NULL	NULL	4	val_4
+NULL	NULL	20	val_20	20	val_20
+NULL	NULL	23	val_23	23	val_23
 NULL	NULL	NULL	NULL	10	val_10
 NULL	NULL	NULL	NULL	17	val_17
 NULL	NULL	NULL	NULL	19	val_19
-NULL	NULL	20	val_20	20	val_20
-NULL	NULL	23	val_23	23	val_23
+NULL	NULL	NULL	NULL	4	val_4
 PREHOOK: query: explain
 select /*+mapjoin(a,b)*/ * from smb_bucket_1 a right outer join smb_bucket_2 b on a.key = b.key full outer join smb_bucket_3 c on b.key=c.key
 PREHOOK: type: QUERY
@@ -944,7 +948,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1), Map 4 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 3 (PARTITION-LEVEL SORT, 3), Map 4 (PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -1022,14 +1026,14 @@ POSTHOOK: Input: default@smb_bucket_1
 POSTHOOK: Input: default@smb_bucket_2
 POSTHOOK: Input: default@smb_bucket_3
 #### A masked pattern was here ####
-NULL	NULL	NULL	NULL	4	val_4
-NULL	NULL	NULL	NULL	10	val_10
-NULL	NULL	NULL	NULL	17	val_17
-NULL	NULL	NULL	NULL	19	val_19
 NULL	NULL	20	val_20	20	val_20
 NULL	NULL	23	val_23	23	val_23
 NULL	NULL	25	val_25	NULL	NULL
 NULL	NULL	30	val_30	NULL	NULL
+NULL	NULL	NULL	NULL	10	val_10
+NULL	NULL	NULL	NULL	17	val_17
+NULL	NULL	NULL	NULL	19	val_19
+NULL	NULL	NULL	NULL	4	val_4
 PREHOOK: query: explain
 select /*+mapjoin(a,b)*/ * from smb_bucket_1 a full outer join smb_bucket_2 b on a.key = b.key join smb_bucket_3 c on b.key=c.key
 PREHOOK: type: QUERY
@@ -1044,7 +1048,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1), Map 4 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 3 (PARTITION-LEVEL SORT, 3), Map 4 (PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -1138,7 +1142,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1), Map 4 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 3 (PARTITION-LEVEL SORT, 3), Map 4 (PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -1217,10 +1221,10 @@ POSTHOOK: Input: default@smb_bucket_2
 POSTHOOK: Input: default@smb_bucket_3
 #### A masked pattern was here ####
 1	val_1	NULL	NULL	NULL	NULL
+10	val_10	NULL	NULL	NULL	NULL
 3	val_3	NULL	NULL	NULL	NULL
 4	val_4	NULL	NULL	NULL	NULL
 5	val_5	NULL	NULL	NULL	NULL
-10	val_10	NULL	NULL	NULL	NULL
 NULL	NULL	20	val_20	20	val_20
 NULL	NULL	23	val_23	23	val_23
 NULL	NULL	25	val_25	NULL	NULL
@@ -1239,7 +1243,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1), Map 4 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 3 (PARTITION-LEVEL SORT, 3), Map 4 (PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -1317,12 +1321,12 @@ POSTHOOK: Input: default@smb_bucket_1
 POSTHOOK: Input: default@smb_bucket_2
 POSTHOOK: Input: default@smb_bucket_3
 #### A masked pattern was here ####
-NULL	NULL	NULL	NULL	4	val_4
+NULL	NULL	20	val_20	20	val_20
+NULL	NULL	23	val_23	23	val_23
 NULL	NULL	NULL	NULL	10	val_10
 NULL	NULL	NULL	NULL	17	val_17
 NULL	NULL	NULL	NULL	19	val_19
-NULL	NULL	20	val_20	20	val_20
-NULL	NULL	23	val_23	23	val_23
+NULL	NULL	NULL	NULL	4	val_4
 PREHOOK: query: explain
 select /*+mapjoin(a,b)*/ * from smb_bucket_1 a full outer join smb_bucket_2 b on a.key = b.key full outer join smb_bucket_3 c on b.key=c.key
 PREHOOK: type: QUERY
@@ -1337,7 +1341,7 @@ STAGE PLANS:
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 1), Map 3 (PARTITION-LEVEL SORT, 1), Map 4 (PARTITION-LEVEL SORT, 1)
+        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 3), Map 3 (PARTITION-LEVEL SORT, 3), Map 4 (PARTITION-LEVEL SORT, 3)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -1416,15 +1420,15 @@ POSTHOOK: Input: default@smb_bucket_2
 POSTHOOK: Input: default@smb_bucket_3
 #### A masked pattern was here ####
 1	val_1	NULL	NULL	NULL	NULL
+10	val_10	NULL	NULL	NULL	NULL
 3	val_3	NULL	NULL	NULL	NULL
 4	val_4	NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL	4	val_4
 5	val_5	NULL	NULL	NULL	NULL
-10	val_10	NULL	NULL	NULL	NULL
-NULL	NULL	NULL	NULL	10	val_10
-NULL	NULL	NULL	NULL	17	val_17
-NULL	NULL	NULL	NULL	19	val_19
 NULL	NULL	20	val_20	20	val_20
 NULL	NULL	23	val_23	23	val_23
 NULL	NULL	25	val_25	NULL	NULL
 NULL	NULL	30	val_30	NULL	NULL
+NULL	NULL	NULL	NULL	10	val_10
+NULL	NULL	NULL	NULL	17	val_17
+NULL	NULL	NULL	NULL	19	val_19
+NULL	NULL	NULL	NULL	4	val_4