You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by li...@apache.org on 2015/03/12 06:48:33 UTC

svn commit: r1666086 - in /hive/branches/spark/ql/src/test: queries/clientpositive/union12.q results/clientpositive/spark/union12.q.out results/clientpositive/spark/union31.q.out results/clientpositive/union12.q.out

Author: lirui
Date: Thu Mar 12 05:48:33 2015
New Revision: 1666086

URL: http://svn.apache.org/r1666086
Log:
HIVE-9924: Fix union12 and union31 for spark [Spark Branch] (Rui reviewed by Xuefu)

Modified:
    hive/branches/spark/ql/src/test/queries/clientpositive/union12.q
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union12.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union31.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/union12.q.out

Modified: hive/branches/spark/ql/src/test/queries/clientpositive/union12.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/union12.q?rev=1666086&r1=1666085&r2=1666086&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/union12.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/union12.q Thu Mar 12 05:48:33 2015
@@ -1,5 +1,7 @@
 set hive.map.aggr = true;
 
+-- SORT_QUERY_RESULTS
+
 -- union case: all subqueries are a map-reduce jobs, 3 way union, different inputs for all sub-queries, followed by filesink
 
 create table tmptable(key string, value int);

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/union12.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/union12.q.out?rev=1666086&r1=1666085&r2=1666086&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/union12.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/union12.q.out Thu Mar 12 05:48:33 2015
@@ -1,10 +1,14 @@
-PREHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way union, different inputs for all sub-queries, followed by filesink
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- union case: all subqueries are a map-reduce jobs, 3 way union, different inputs 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, different inputs for all sub-queries, followed by filesink
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- union case: all subqueries are a map-reduce jobs, 3 way union, different inputs for all sub-queries, followed by filesink
 
 create table tmptable(key string, value int)
 POSTHOOK: type: CREATETABLE

Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/union31.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/union31.q.out?rev=1666086&r1=1666085&r2=1666086&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/spark/union31.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/spark/union31.q.out Thu Mar 12 05:48:33 2015
@@ -343,7 +343,7 @@ STAGE PLANS:
       Edges:
         Reducer 2 <- Map 1 (GROUP, 2)
         Reducer 5 <- Map 4 (GROUP, 2)
-        Reducer 3 <- Reducer 2 (SORT, 2), Reducer 5 (SORT, 2)
+        Reducer 3 <- Reducer 2 (GROUP PARTITION-LEVEL SORT, 2), Reducer 5 (GROUP PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -629,7 +629,7 @@ STAGE PLANS:
     Spark
       Edges:
         Reducer 2 <- Map 1 (GROUP, 2)
-        Reducer 3 <- Map 4 (SORT, 2), Reducer 2 (SORT, 2)
+        Reducer 3 <- Map 4 (GROUP PARTITION-LEVEL SORT, 2), Reducer 2 (GROUP PARTITION-LEVEL SORT, 2)
 #### A masked pattern was here ####
       Vertices:
         Map 1 

Modified: hive/branches/spark/ql/src/test/results/clientpositive/union12.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union12.q.out?rev=1666086&r1=1666085&r2=1666086&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union12.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union12.q.out Thu Mar 12 05:48:33 2015
@@ -1,10 +1,14 @@
-PREHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way union, different inputs for all sub-queries, followed by filesink
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- union case: all subqueries are a map-reduce jobs, 3 way union, different inputs 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, different inputs for all sub-queries, followed by filesink
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- union case: all subqueries are a map-reduce jobs, 3 way union, different inputs for all sub-queries, followed by filesink
 
 create table tmptable(key string, value int)
 POSTHOOK: type: CREATETABLE