hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sze...@apache.org
Subject [32/44] hive git commit: HIVE-9924: Fix union12 and union31 for spark [Spark Branch] (Rui reviewed by Xuefu)
Date Thu, 23 Apr 2015 02:34:41 GMT
HIVE-9924: Fix union12 and union31 for spark [Spark Branch] (Rui reviewed by Xuefu)

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/spark@1666086 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/2c432703
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/2c432703
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/2c432703

Branch: refs/heads/master
Commit: 2c432703ceaa74511cf0da3751ef1e1c27062a03
Parents: 14129df
Author: Rui Li <lirui@apache.org>
Authored: Thu Mar 12 05:48:33 2015 +0000
Committer: Szehon Ho <szehon@cloudera.com>
Committed: Wed Apr 22 19:33:52 2015 -0700

----------------------------------------------------------------------
 ql/src/test/queries/clientpositive/union12.q           | 2 ++
 ql/src/test/results/clientpositive/spark/union12.q.out | 8 ++++++--
 ql/src/test/results/clientpositive/spark/union31.q.out | 4 ++--
 ql/src/test/results/clientpositive/union12.q.out       | 8 ++++++--
 4 files changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/2c432703/ql/src/test/queries/clientpositive/union12.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union12.q b/ql/src/test/queries/clientpositive/union12.q
index b0893df..de0acd2 100644
--- a/ql/src/test/queries/clientpositive/union12.q
+++ b/ql/src/test/queries/clientpositive/union12.q
@@ -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);

http://git-wip-us.apache.org/repos/asf/hive/blob/2c432703/ql/src/test/results/clientpositive/spark/union12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union12.q.out b/ql/src/test/results/clientpositive/spark/union12.q.out
index c13675e..cd21b73 100644
--- a/ql/src/test/results/clientpositive/spark/union12.q.out
+++ b/ql/src/test/results/clientpositive/spark/union12.q.out
@@ -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

http://git-wip-us.apache.org/repos/asf/hive/blob/2c432703/ql/src/test/results/clientpositive/spark/union31.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union31.q.out b/ql/src/test/results/clientpositive/spark/union31.q.out
index 7d99d07..d58d17c 100644
--- a/ql/src/test/results/clientpositive/spark/union31.q.out
+++ b/ql/src/test/results/clientpositive/spark/union31.q.out
@@ -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 

http://git-wip-us.apache.org/repos/asf/hive/blob/2c432703/ql/src/test/results/clientpositive/union12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union12.q.out b/ql/src/test/results/clientpositive/union12.q.out
index ee91607..d65086b 100644
--- a/ql/src/test/results/clientpositive/union12.q.out
+++ b/ql/src/test/results/clientpositive/union12.q.out
@@ -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


Mime
View raw message