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/21 23:28:17 UTC

svn commit: r1619598 - in /hive/branches/spark: ./ ql/src/test/queries/clientpositive/union_null.q ql/src/test/results/clientpositive/union_null.q.out

Author: brock
Date: Thu Aug 21 21:28:16 2014
New Revision: 1619598

URL: http://svn.apache.org/r1619598
Log:
Merged HIVE-7820 - union_null.q is not deterministic (Brock Noland reviewed by Szehon)

Modified:
    hive/branches/spark/   (props changed)
    hive/branches/spark/ql/src/test/queries/clientpositive/union_null.q
    hive/branches/spark/ql/src/test/results/clientpositive/union_null.q.out

Propchange: hive/branches/spark/
------------------------------------------------------------------------------
  Merged /hive/trunk:r1619597

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=1619598&r1=1619597&r2=1619598&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 Thu Aug 21 21:28:16 2014
@@ -1,7 +1,7 @@
 -- 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;
+select x from (select value as x from src order by x limit 5 union all select NULL as x from src limit 5) a;
 
 -- HIVE-4837
 select * from (select null as N from src1 group by key UNION ALL select null as N from src1 group by key ) a;

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=1619598&r1=1619597&r2=1619598&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 Thu Aug 21 21:28:16 2014
@@ -1,26 +1,26 @@
 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
+select x from (select value as x from src order by x limit 5 union all select NULL as x from src limit 5) a
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
 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
+select x from (select value as x from src order by x limit 5 union all select NULL as x from src limit 5) a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
-val_238
+val_0
+val_0
+val_0
+val_10
+val_100
 NULL
-val_86
 NULL
-val_311
 NULL
-val_27
 NULL
-val_165
 NULL
 PREHOOK: query: -- HIVE-4837
 select * from (select null as N from src1 group by key UNION ALL select null as N from src1 group by key ) a