HIVE-8618: Add SORT_QUERY_RESULTS for test that doesn't guarantee order

#3 (Chao via Xuefu) - adding to branch-0.14 git-svn-id: https://svn.apache.org/repos/asf/hive/branches/branch-0.14@1637472 13f79535-47bb-0310-9956-ffa450edef68
apache · Nov 7, 2014 · 48baf42 · 48baf42
1 parent 40fc2db
commit 48baf42
Show file tree

Hide file tree

Showing 8 changed files with 719 additions and 701 deletions.
diff --git a/ql/src/test/queries/clientpositive/auto_join26.q b/ql/src/test/queries/clientpositive/auto_join26.q
@@ -1,4 +1,4 @@
---SORT_QUERY_RESULTS
+-- SORT_QUERY_RESULTS
 
 CREATE TABLE dest_j1(key INT, cnt INT);
 set hive.auto.convert.join = true;

diff --git a/ql/src/test/queries/clientpositive/date_join1.q b/ql/src/test/queries/clientpositive/date_join1.q
@@ -1,5 +1,7 @@
 drop table date_join1;
 
+-- SORT_QUERY_RESULTS
+
 create table date_join1 (
   ORIGIN_CITY_NAME string,
   DEST_CITY_NAME string,

diff --git a/ql/src/test/queries/clientpositive/join40.q b/ql/src/test/queries/clientpositive/join40.q
@@ -1,5 +1,7 @@
 set hive.join.cache.size=1;
 
+-- SORT_QUERY_RESULTS
+
 EXPLAIN SELECT x.key, x.value, y.key, y.value
 FROM src x left outer JOIN (select * from src where key <= 100) y ON (x.key = y.key);
 

diff --git a/ql/src/test/queries/clientpositive/vector_decimal_mapjoin.q b/ql/src/test/queries/clientpositive/vector_decimal_mapjoin.q
@@ -1,3 +1,5 @@
+-- SORT_QUERY_RESULTS
+
 CREATE TABLE decimal_mapjoin STORED AS ORC AS 
   SELECT cdouble, CAST (((cdouble*22.1)/37) AS DECIMAL(20,10)) AS cdecimal1, 
   CAST (((cdouble*9.3)/13) AS DECIMAL(23,14)) AS cdecimal2,
@@ -16,4 +18,4 @@ EXPLAIN SELECT l.cint, r.cint, l.cdecimal1, r.cdecimal2
 SELECT l.cint, r.cint, l.cdecimal1, r.cdecimal2
   FROM decimal_mapjoin l
   JOIN decimal_mapjoin r ON l.cint = r.cint
-  WHERE l.cint = 6981;
+  WHERE l.cint = 6981;
diff --git a/ql/src/test/results/clientpositive/auto_join26.q.out b/ql/src/test/results/clientpositive/auto_join26.q.out
@@ -1,10 +1,10 @@
-PREHOOK: query: --SORT_QUERY_RESULTS
+PREHOOK: query: -- SORT_QUERY_RESULTS
 
 CREATE TABLE dest_j1(key INT, cnt INT)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@dest_j1
-POSTHOOK: query: --SORT_QUERY_RESULTS
+POSTHOOK: query: -- SORT_QUERY_RESULTS
 
 CREATE TABLE dest_j1(key INT, cnt INT)
 POSTHOOK: type: CREATETABLE

diff --git a/ql/src/test/results/clientpositive/date_join1.q.out b/ql/src/test/results/clientpositive/date_join1.q.out
@@ -2,7 +2,9 @@ PREHOOK: query: drop table date_join1
 PREHOOK: type: DROPTABLE
 POSTHOOK: query: drop table date_join1
 POSTHOOK: type: DROPTABLE
-PREHOOK: query: create table date_join1 (
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+create table date_join1 (
   ORIGIN_CITY_NAME string,
   DEST_CITY_NAME string,
   FL_DATE date,
@@ -12,7 +14,9 @@ PREHOOK: query: create table date_join1 (
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@date_join1
-POSTHOOK: query: create table date_join1 (
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+create table date_join1 (
   ORIGIN_CITY_NAME string,
   DEST_CITY_NAME string,
   FL_DATE date,
@@ -47,27 +51,27 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@date_join1
 #### A masked pattern was here ####
 1064	2000-11-20	1064	2000-11-20
-1142	2000-11-21	1142	2000-11-21
-1599	2000-11-22	1599	2000-11-22
-361	2000-11-23	361	2000-11-23
-897	2000-11-24	897	2000-11-24
-1531	2000-11-25	1531	2000-11-25
-1610	2000-11-26	1610	2000-11-26
-3198	2000-11-27	3198	2000-11-27
-1142	2000-11-28	1064	2000-11-28
-1142	2000-11-28	1142	2000-11-28
 1064	2000-11-28	1064	2000-11-28
 1064	2000-11-28	1142	2000-11-28
 1064	2010-10-20	1064	2010-10-20
+1064	2010-10-28	1064	2010-10-28
+1142	2000-11-21	1142	2000-11-21
+1142	2000-11-28	1064	2000-11-28
+1142	2000-11-28	1142	2000-11-28
 1142	2010-10-21	1142	2010-10-21
-1599	2010-10-22	1599	2010-10-22
-361	2010-10-23	361	2010-10-23
-897	2010-10-24	897	2010-10-24
+1142	2010-10-29	1142	2010-10-29
+1531	2000-11-25	1531	2000-11-25
 1531	2010-10-25	1531	2010-10-25
+1599	2000-11-22	1599	2000-11-22
+1599	2010-10-22	1599	2010-10-22
+1610	2000-11-26	1610	2000-11-26
 1610	2010-10-26	1610	2010-10-26
+3198	2000-11-27	3198	2000-11-27
 3198	2010-10-27	3198	2010-10-27
-1064	2010-10-28	1064	2010-10-28
-1142	2010-10-29	1142	2010-10-29
+361	2000-11-23	361	2000-11-23
+361	2010-10-23	361	2010-10-23
+897	2000-11-24	897	2000-11-24
+897	2010-10-24	897	2010-10-24
 PREHOOK: query: drop table date_join1
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@date_join1