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/08/19 21:14:34 UTC
svn commit: r1618942 - in /hive/branches/spark: ./
ql/src/test/queries/clientpositive/ ql/src/test/results/clientpositive/
Author: brock
Date: Tue Aug 19 19:14:33 2014
New Revision: 1618942
URL: http://svn.apache.org/r1618942
Log:
Merged HIVE-7769 - add --SORT_BEFORE_DIFF to union all .q tests (Na Yang via Brock)
Modified:
hive/branches/spark/ (props changed)
hive/branches/spark/ql/src/test/queries/clientpositive/union.q
hive/branches/spark/ql/src/test/queries/clientpositive/union11.q
hive/branches/spark/ql/src/test/queries/clientpositive/union13.q
hive/branches/spark/ql/src/test/queries/clientpositive/union14.q
hive/branches/spark/ql/src/test/queries/clientpositive/union15.q
hive/branches/spark/ql/src/test/queries/clientpositive/union16.q
hive/branches/spark/ql/src/test/queries/clientpositive/union17.q
hive/branches/spark/ql/src/test/queries/clientpositive/union2.q
hive/branches/spark/ql/src/test/queries/clientpositive/union20.q
hive/branches/spark/ql/src/test/queries/clientpositive/union21.q
hive/branches/spark/ql/src/test/queries/clientpositive/union27.q
hive/branches/spark/ql/src/test/queries/clientpositive/union3.q
hive/branches/spark/ql/src/test/queries/clientpositive/union33.q
hive/branches/spark/ql/src/test/queries/clientpositive/union5.q
hive/branches/spark/ql/src/test/queries/clientpositive/union7.q
hive/branches/spark/ql/src/test/queries/clientpositive/union8.q
hive/branches/spark/ql/src/test/queries/clientpositive/union9.q
hive/branches/spark/ql/src/test/queries/clientpositive/union_null.q
hive/branches/spark/ql/src/test/results/clientpositive/union.q.out
hive/branches/spark/ql/src/test/results/clientpositive/union11.q.out
hive/branches/spark/ql/src/test/results/clientpositive/union13.q.out
hive/branches/spark/ql/src/test/results/clientpositive/union14.q.out
hive/branches/spark/ql/src/test/results/clientpositive/union15.q.out
hive/branches/spark/ql/src/test/results/clientpositive/union16.q.out
hive/branches/spark/ql/src/test/results/clientpositive/union17.q.out
hive/branches/spark/ql/src/test/results/clientpositive/union2.q.out
hive/branches/spark/ql/src/test/results/clientpositive/union20.q.out
hive/branches/spark/ql/src/test/results/clientpositive/union21.q.out
hive/branches/spark/ql/src/test/results/clientpositive/union27.q.out
hive/branches/spark/ql/src/test/results/clientpositive/union3.q.out
hive/branches/spark/ql/src/test/results/clientpositive/union33.q.out
hive/branches/spark/ql/src/test/results/clientpositive/union5.q.out
hive/branches/spark/ql/src/test/results/clientpositive/union7.q.out
hive/branches/spark/ql/src/test/results/clientpositive/union8.q.out
hive/branches/spark/ql/src/test/results/clientpositive/union9.q.out
hive/branches/spark/ql/src/test/results/clientpositive/union_null.q.out
Propchange: hive/branches/spark/
------------------------------------------------------------------------------
Merged /hive/trunk:r1618941
Modified: hive/branches/spark/ql/src/test/queries/clientpositive/union.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/union.q?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/union.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/union.q Tue Aug 19 19:14:33 2014
@@ -1,3 +1,4 @@
+-- SORT_BEFORE_DIFF
-- union case: both subqueries are map jobs on same input, followed by filesink
EXPLAIN
Modified: hive/branches/spark/ql/src/test/queries/clientpositive/union11.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/union11.q?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/union11.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/union11.q Tue Aug 19 19:14:33 2014
@@ -1,5 +1,5 @@
set hive.map.aggr = true;
-
+-- SORT_BEFORE_DIFF
-- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by reducesink
explain
Modified: hive/branches/spark/ql/src/test/queries/clientpositive/union13.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/union13.q?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/union13.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/union13.q Tue Aug 19 19:14:33 2014
@@ -1,3 +1,4 @@
+-- SORT_BEFORE_DIFF
-- union case: both subqueries are a map-only jobs, same input, followed by filesink
explain
Modified: hive/branches/spark/ql/src/test/queries/clientpositive/union14.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/union14.q?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/union14.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/union14.q Tue Aug 19 19:14:33 2014
@@ -1,5 +1,5 @@
set hive.map.aggr = true;
-
+-- SORT_BEFORE_DIFF
-- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
explain
Modified: hive/branches/spark/ql/src/test/queries/clientpositive/union15.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/union15.q?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/union15.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/union15.q Tue Aug 19 19:14:33 2014
@@ -1,5 +1,5 @@
set hive.map.aggr = true;
-
+-- SORT_BEFORE_DIFF
-- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
explain
Modified: hive/branches/spark/ql/src/test/queries/clientpositive/union16.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/union16.q?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/union16.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/union16.q Tue Aug 19 19:14:33 2014
@@ -1,3 +1,4 @@
+-- SORT_BEFORE_DIFF
EXPLAIN
SELECT count(1) FROM (
SELECT key, value FROM src UNION ALL
Modified: hive/branches/spark/ql/src/test/queries/clientpositive/union17.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/union17.q?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/union17.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/union17.q Tue Aug 19 19:14:33 2014
@@ -1,6 +1,7 @@
CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE;
CREATE TABLE DEST2(key STRING, val1 STRING, val2 STRING) STORED AS TEXTFILE;
+-- SORT_BEFORE_DIFF
-- union case:map-reduce sub-queries followed by multi-table insert
explain
Modified: hive/branches/spark/ql/src/test/queries/clientpositive/union2.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/union2.q?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/union2.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/union2.q Tue Aug 19 19:14:33 2014
@@ -1,3 +1,4 @@
+-- SORT_BEFORE_DIFF
-- union case: both subqueries are map-reduce jobs on same input, followed by reduce sink
explain
Modified: hive/branches/spark/ql/src/test/queries/clientpositive/union20.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/union20.q?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/union20.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/union20.q Tue Aug 19 19:14:33 2014
@@ -1,3 +1,4 @@
+-- SORT_BEFORE_DIFF
-- union :map-reduce sub-queries followed by join
explain
Modified: hive/branches/spark/ql/src/test/queries/clientpositive/union21.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/union21.q?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/union21.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/union21.q Tue Aug 19 19:14:33 2014
@@ -1,3 +1,4 @@
+-- SORT_BEFORE_DIFF
-- union of constants, udf outputs, and columns from text table and thrift table
explain
Modified: hive/branches/spark/ql/src/test/queries/clientpositive/union27.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/union27.q?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/union27.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/union27.q Tue Aug 19 19:14:33 2014
@@ -1,3 +1,4 @@
+-- SORT_BEFORE_DIFF
create table jackson_sev_same as select * from src;
create table dim_pho as select * from src;
create table jackson_sev_add as select * from src;
Modified: hive/branches/spark/ql/src/test/queries/clientpositive/union3.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/union3.q?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/union3.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/union3.q Tue Aug 19 19:14:33 2014
@@ -1,3 +1,4 @@
+-- SORT_BEFORE_DIFF
explain
SELECT *
Modified: hive/branches/spark/ql/src/test/queries/clientpositive/union33.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/union33.q?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/union33.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/union33.q Tue Aug 19 19:14:33 2014
@@ -1,5 +1,5 @@
set hive.groupby.skewindata=true;
-
+-- SORT_BEFORE_DIFF
-- This tests that a union all with a map only subquery on one side and a
-- subquery involving two map reduce jobs on the other runs correctly.
Modified: hive/branches/spark/ql/src/test/queries/clientpositive/union5.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/union5.q?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/union5.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/union5.q Tue Aug 19 19:14:33 2014
@@ -1,5 +1,5 @@
set hive.map.aggr = true;
-
+-- SORT_BEFORE_DIFF
-- union case: both subqueries are map-reduce jobs on same input, followed by reduce sink
explain
Modified: hive/branches/spark/ql/src/test/queries/clientpositive/union7.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/union7.q?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/union7.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/union7.q Tue Aug 19 19:14:33 2014
@@ -1,5 +1,6 @@
set hive.map.aggr = true;
+-- SORT_BEFORE_DIFF
-- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
explain
Modified: hive/branches/spark/ql/src/test/queries/clientpositive/union8.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/union8.q?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/union8.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/union8.q Tue Aug 19 19:14:33 2014
@@ -1,3 +1,4 @@
+-- SORT_BEFORE_DIFF
-- union case: all subqueries are a map-only jobs, 3 way union, same input for all sub-queries, followed by filesink
explain
Modified: hive/branches/spark/ql/src/test/queries/clientpositive/union9.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/union9.q?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/union9.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/union9.q Tue Aug 19 19:14:33 2014
@@ -1,3 +1,4 @@
+-- SORT_BEFORE_DIFF
-- union case: all subqueries are a map-only jobs, 3 way union, same input for all sub-queries, followed by reducesink
explain
Modified: hive/branches/spark/ql/src/test/queries/clientpositive/union_null.q
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/queries/clientpositive/union_null.q?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/queries/clientpositive/union_null.q (original)
+++ hive/branches/spark/ql/src/test/queries/clientpositive/union_null.q Tue Aug 19 19:14:33 2014
@@ -1,3 +1,5 @@
+-- SORT_BEFORE_DIFF
+
-- HIVE-2901
select x from (select value as x from src union all select NULL as x from src)a limit 10;
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union.q.out?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union.q.out Tue Aug 19 19:14:33 2014
@@ -1,4 +1,5 @@
-PREHOOK: query: -- union case: both subqueries are map jobs on same input, followed by filesink
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: both subqueries are map jobs on same input, followed by filesink
EXPLAIN
FROM (
@@ -8,7 +9,8 @@ FROM (
) unioninput
INSERT OVERWRITE DIRECTORY 'target/warehouse/union.out' SELECT unioninput.*
PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: both subqueries are map jobs on same input, followed by filesink
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: both subqueries are map jobs on same input, followed by filesink
EXPLAIN
FROM (
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union11.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union11.q.out?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union11.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union11.q.out Tue Aug 19 19:14:33 2014
@@ -1,4 +1,5 @@
-PREHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by reducesink
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by reducesink
explain
select unionsrc.key, count(1) FROM (select 'tst1' as key, count(1) as value from src s1
@@ -7,7 +8,8 @@ explain
UNION ALL
select 'tst3' as key, count(1) as value from src s3) unionsrc group by unionsrc.key
PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by reducesink
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by reducesink
explain
select unionsrc.key, count(1) FROM (select 'tst1' as key, count(1) as value from src s1
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union13.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union13.q.out?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union13.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union13.q.out Tue Aug 19 19:14:33 2014
@@ -1,10 +1,12 @@
-PREHOOK: query: -- union case: both subqueries are a map-only jobs, same input, followed by filesink
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: both subqueries are a map-only jobs, same input, followed by filesink
explain
select unionsrc.key, unionsrc.value FROM (select s1.key as key, s1.value as value from src s1 UNION ALL
select s2.key as key, s2.value as value from src s2) unionsrc
PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: both subqueries are a map-only jobs, same input, followed by filesink
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: both subqueries are a map-only jobs, same input, followed by filesink
explain
select unionsrc.key, unionsrc.value FROM (select s1.key as key, s1.value as value from src s1 UNION ALL
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union14.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union14.q.out?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union14.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union14.q.out Tue Aug 19 19:14:33 2014
@@ -1,4 +1,5 @@
-PREHOOK: query: -- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
explain
select unionsrc.key, count(1) FROM (select s2.key as key, s2.value as value from src1 s2
@@ -6,7 +7,8 @@ explain
select 'tst1' as key, cast(count(1) as string) as value from src s1)
unionsrc group by unionsrc.key
PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
explain
select unionsrc.key, count(1) FROM (select s2.key as key, s2.value as value from src1 s2
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union15.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union15.q.out?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union15.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union15.q.out Tue Aug 19 19:14:33 2014
@@ -1,4 +1,5 @@
-PREHOOK: query: -- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
explain
select unionsrc.key, count(1) FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1
@@ -7,7 +8,8 @@ explain
UNION ALL
select s3.key as key, s3.value as value from src1 s3) unionsrc group by unionsrc.key
PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
explain
select unionsrc.key, count(1) FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union16.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union16.q.out?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union16.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union16.q.out Tue Aug 19 19:14:33 2014
@@ -1,4 +1,5 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- SORT_BEFORE_DIFF
+EXPLAIN
SELECT count(1) FROM (
SELECT key, value FROM src UNION ALL
SELECT key, value FROM src UNION ALL
@@ -30,7 +31,8 @@ SELECT count(1) FROM (
SELECT key, value FROM src UNION ALL
SELECT key, value FROM src) src
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+EXPLAIN
SELECT count(1) FROM (
SELECT key, value FROM src UNION ALL
SELECT key, value FROM src UNION ALL
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union17.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union17.q.out?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union17.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union17.q.out Tue Aug 19 19:14:33 2014
@@ -14,7 +14,8 @@ POSTHOOK: query: CREATE TABLE DEST2(key
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@DEST2
-PREHOOK: query: -- union case:map-reduce sub-queries followed by multi-table insert
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union case:map-reduce sub-queries followed by multi-table insert
explain
FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1
@@ -23,7 +24,8 @@ FROM (select 'tst1' as key, cast(count(1
INSERT OVERWRITE TABLE DEST1 SELECT unionsrc.key, COUNT(DISTINCT SUBSTR(unionsrc.value,5)) GROUP BY unionsrc.key
INSERT OVERWRITE TABLE DEST2 SELECT unionsrc.key, unionsrc.value, COUNT(DISTINCT SUBSTR(unionsrc.value,5)) GROUP BY unionsrc.key, unionsrc.value
PREHOOK: type: QUERY
-POSTHOOK: query: -- union case:map-reduce sub-queries followed by multi-table insert
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union case:map-reduce sub-queries followed by multi-table insert
explain
FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union2.q.out?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union2.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union2.q.out Tue Aug 19 19:14:33 2014
@@ -1,10 +1,12 @@
-PREHOOK: query: -- union case: both subqueries are map-reduce jobs on same input, followed by reduce sink
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: both subqueries are map-reduce jobs on same input, followed by reduce sink
explain
select count(1) FROM (select s1.key as key, s1.value as value from src s1 UNION ALL
select s2.key as key, s2.value as value from src s2) unionsrc
PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: both subqueries are map-reduce jobs on same input, followed by reduce sink
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: both subqueries are map-reduce jobs on same input, followed by reduce sink
explain
select count(1) FROM (select s1.key as key, s1.value as value from src s1 UNION ALL
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union20.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union20.q.out?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union20.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union20.q.out Tue Aug 19 19:14:33 2014
@@ -1,4 +1,5 @@
-PREHOOK: query: -- union :map-reduce sub-queries followed by join
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union :map-reduce sub-queries followed by join
explain
SELECT unionsrc1.key, unionsrc1.value, unionsrc2.key, unionsrc2.value
@@ -11,7 +12,8 @@ JOIN
select s4.key as key, s4.value as value from src s4 where s4.key < 10) unionsrc2
ON (unionsrc1.key = unionsrc2.key)
PREHOOK: type: QUERY
-POSTHOOK: query: -- union :map-reduce sub-queries followed by join
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union :map-reduce sub-queries followed by join
explain
SELECT unionsrc1.key, unionsrc1.value, unionsrc2.key, unionsrc2.value
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union21.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union21.q.out?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union21.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union21.q.out Tue Aug 19 19:14:33 2014
@@ -1,4 +1,5 @@
-PREHOOK: query: -- union of constants, udf outputs, and columns from text table and thrift table
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union of constants, udf outputs, and columns from text table and thrift table
explain
SELECT key, count(1)
@@ -15,7 +16,8 @@ FROM (
) union_output
GROUP BY key
PREHOOK: type: QUERY
-POSTHOOK: query: -- union of constants, udf outputs, and columns from text table and thrift table
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union of constants, udf outputs, and columns from text table and thrift table
explain
SELECT key, count(1)
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union27.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union27.q.out?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union27.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union27.q.out Tue Aug 19 19:14:33 2014
@@ -1,7 +1,9 @@
-PREHOOK: query: create table jackson_sev_same as select * from src
+PREHOOK: query: -- SORT_BEFORE_DIFF
+create table jackson_sev_same as select * from src
PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@src
-POSTHOOK: query: create table jackson_sev_same as select * from src
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+create table jackson_sev_same as select * from src
POSTHOOK: type: CREATETABLE_AS_SELECT
POSTHOOK: Input: default@src
POSTHOOK: Output: default@jackson_sev_same
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union3.q.out?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union3.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union3.q.out Tue Aug 19 19:14:33 2014
@@ -1,4 +1,6 @@
-PREHOOK: query: explain
+PREHOOK: query: -- SORT_BEFORE_DIFF
+
+explain
SELECT *
FROM (
SELECT 1 AS id
@@ -16,7 +18,9 @@ FROM (
FROM (SELECT * FROM src LIMIT 1) s2
) a
PREHOOK: type: QUERY
-POSTHOOK: query: explain
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+
+explain
SELECT *
FROM (
SELECT 1 AS id
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union33.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union33.q.out?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union33.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union33.q.out Tue Aug 19 19:14:33 2014
@@ -1,11 +1,13 @@
-PREHOOK: query: -- This tests that a union all with a map only subquery on one side and a
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- This tests that a union all with a map only subquery on one side and a
-- subquery involving two map reduce jobs on the other runs correctly.
CREATE TABLE test_src (key STRING, value STRING)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@test_src
-POSTHOOK: query: -- This tests that a union all with a map only subquery on one side and a
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- This tests that a union all with a map only subquery on one side and a
-- subquery involving two map reduce jobs on the other runs correctly.
CREATE TABLE test_src (key STRING, value STRING)
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union5.q.out?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union5.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union5.q.out Tue Aug 19 19:14:33 2014
@@ -1,11 +1,13 @@
-PREHOOK: query: -- union case: both subqueries are map-reduce jobs on same input, followed by reduce sink
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: both subqueries are map-reduce jobs on same input, followed by reduce sink
explain
select unionsrc.key, count(1) FROM (select 'tst1' as key, count(1) as value from src s1
UNION ALL
select 'tst2' as key, count(1) as value from src s2) unionsrc group by unionsrc.key
PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: both subqueries are map-reduce jobs on same input, followed by reduce sink
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: both subqueries are map-reduce jobs on same input, followed by reduce sink
explain
select unionsrc.key, count(1) FROM (select 'tst1' as key, count(1) as value from src s1
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union7.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union7.q.out?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union7.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union7.q.out Tue Aug 19 19:14:33 2014
@@ -1,11 +1,13 @@
-PREHOOK: query: -- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
explain
select unionsrc.key, count(1) FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1
UNION ALL
select s2.key as key, s2.value as value from src1 s2) unionsrc group by unionsrc.key
PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
explain
select unionsrc.key, count(1) FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union8.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union8.q.out?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union8.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union8.q.out Tue Aug 19 19:14:33 2014
@@ -1,11 +1,13 @@
-PREHOOK: query: -- union case: all subqueries are a map-only jobs, 3 way union, same input for all sub-queries, followed by filesink
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: all subqueries are a map-only jobs, 3 way union, same input for all sub-queries, followed by filesink
explain
select unionsrc.key, unionsrc.value FROM (select s1.key as key, s1.value as value from src s1 UNION ALL
select s2.key as key, s2.value as value from src s2 UNION ALL
select s3.key as key, s3.value as value from src s3) unionsrc
PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: all subqueries are a map-only jobs, 3 way union, same input for all sub-queries, followed by filesink
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: all subqueries are a map-only jobs, 3 way union, same input for all sub-queries, followed by filesink
explain
select unionsrc.key, unionsrc.value FROM (select s1.key as key, s1.value as value from src s1 UNION ALL
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union9.q.out?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union9.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union9.q.out Tue Aug 19 19:14:33 2014
@@ -1,11 +1,13 @@
-PREHOOK: query: -- union case: all subqueries are a map-only jobs, 3 way union, same input for all sub-queries, followed by reducesink
+PREHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: all subqueries are a map-only jobs, 3 way union, same input for all sub-queries, followed by reducesink
explain
select count(1) FROM (select s1.key as key, s1.value as value from src s1 UNION ALL
select s2.key as key, s2.value as value from src s2 UNION ALL
select s3.key as key, s3.value as value from src s3) unionsrc
PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: all subqueries are a map-only jobs, 3 way union, same input for all sub-queries, followed by reducesink
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+-- union case: all subqueries are a map-only jobs, 3 way union, same input for all sub-queries, followed by reducesink
explain
select count(1) FROM (select s1.key as key, s1.value as value from src s1 UNION ALL
Modified: hive/branches/spark/ql/src/test/results/clientpositive/union_null.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/union_null.q.out?rev=1618942&r1=1618941&r2=1618942&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/union_null.q.out (original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/union_null.q.out Tue Aug 19 19:14:33 2014
@@ -1,9 +1,13 @@
-PREHOOK: query: -- HIVE-2901
+PREHOOK: query: -- SORT_BEFORE_DIFF
+
+-- HIVE-2901
select x from (select value as x from src union all select NULL as x from src)a limit 10
PREHOOK: type: QUERY
PREHOOK: Input: default@src
#### A masked pattern was here ####
-POSTHOOK: query: -- HIVE-2901
+POSTHOOK: query: -- SORT_BEFORE_DIFF
+
+-- HIVE-2901
select x from (select value as x from src union all select NULL as x from src)a limit 10
POSTHOOK: type: QUERY
POSTHOOK: Input: default@src