Author: sershe
Date: Tue Dec 16 19:37:13 2014
New Revision: 1646055
URL: http://svn.apache.org/r1646055
Log:
HIVE-9114 : union all query in cbo test has undefined ordering (Sergey
Shelukhin, reviewed by Ashutosh Chauhan)
Modified:
hive/trunk/ql/src/test/queries/clientpositive/cbo_union.q
hive/trunk/ql/src/test/results/clientpositive/cbo_union.q.out
hive/trunk/ql/src/test/results/clientpositive/tez/cbo_union.q.out
Modified: hive/trunk/ql/src/test/queries/clientpositive/cbo_union.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/cbo_union.q?rev=1646055&r1=1646054&r2=1646055&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/cbo_union.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/cbo_union.q Tue Dec 16
19:37:13 2014
@@ -4,6 +4,8 @@ set hive.exec.check.crossproducts=false;
set hive.stats.fetch.column.stats=true;
set hive.auto.convert.join=false;
+-- SORT_QUERY_RESULTS
+
-- 11. Union All
select * from cbo_t1 order by key, c_boolean, value, dt union all select *
from cbo_t2 order by key, c_boolean, value, dt;
select key from (select key, c_int from (select * from cbo_t1 union all select
* from cbo_t2 where cbo_t2.key >=0)r1 union all select key, c_int from
cbo_t3)r2 where key >=0 order by key;
Modified: hive/trunk/ql/src/test/results/clientpositive/cbo_union.q.out
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/cbo_union.q.out?rev=1646055&r1=1646054&r2=1646055&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/cbo_union.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/cbo_union.q.out Tue Dec 16
19:37:13 2014
@@ -1,4 +1,6 @@
-PREHOOK: query: -- 11. Union All
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- 11. Union All
select * from cbo_t1 order by key, c_boolean, value, dt union all select *
from cbo_t2 order by key, c_boolean, value, dt
PREHOOK: type: QUERY
PREHOOK: Input: default@cbo_t1
@@ -6,7 +8,9 @@ PREHOOK: Input: default@cbo_t1@dt=2014
PREHOOK: Input: default@cbo_t2
PREHOOK: Input: default@cbo_t2@dt=2014
#### A masked pattern was here ####
-POSTHOOK: query: -- 11. Union All
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- 11. Union All
select * from cbo_t1 order by key, c_boolean, value, dt union all select *
from cbo_t2 order by key, c_boolean, value, dt
POSTHOOK: type: QUERY
POSTHOOK: Input: default@cbo_t1
@@ -16,8 +20,14 @@ POSTHOOK: Input: default@cbo_t2@dt=2014
#### A masked pattern was here ####
1 1 1 1.0 true 2014
1 1 1 1.0 true 2014
+ 1 1 1 1.0 true 2014
+ 1 1 1 1.0 true 2014
+ 1 1 1 1.0 true 2014
1 1 1 1.0 true 2014
1 1 1 1.0 true 2014
+ 1 1 1 1.0 true 2014
+1 1 1 1.0 false 2014
+1 1 1 1.0 false 2014
1 1 1 1.0 false 2014
1 1 1 1.0 false 2014
1 1 1 1.0 true 2014
@@ -30,16 +40,6 @@ POSTHOOK: Input: default@cbo_t2@dt=2014
1 1 1 1.0 true 2014
1 1 1 1.0 true 2014
1 1 1 1.0 true 2014
-1 1 1 1.0 true 2014
-1 1 1 1.0 true 2014
-null null NULL NULL NULL 2014
-null null NULL NULL NULL 2014
- 1 1 1 1.0 true 2014
- 1 1 1 1.0 true 2014
- 1 1 1 1.0 true 2014
- 1 1 1 1.0 true 2014
-1 1 1 1.0 false 2014
-1 1 1 1.0 false 2014
1 1 1 1.0 true 2014
1 1 1 1.0 true 2014
1 1 1 1.0 true 2014
@@ -47,6 +47,8 @@ null null NULL NULL NULL 2014
1 1 1 1.0 true 2014
1 1 1 1.0 true 2014
1 1 1 1.0 true 2014
+1 1 1 1.0 true 2014
+1 1 1 1.0 true 2014
2 2 2 2.0 true 2014
2 2 2 2.0 true 2014
2 2 2 2.0 true 2014
@@ -54,6 +56,8 @@ null null NULL NULL NULL 2014
2 2 2 2.0 true 2014
null null NULL NULL NULL 2014
null null NULL NULL NULL 2014
+null null NULL NULL NULL 2014
+null null NULL NULL NULL 2014
PREHOOK: query: select key from (select key, c_int from (select * from cbo_t1
union all select * from cbo_t2 where cbo_t2.key >=0)r1 union all select key,
c_int from cbo_t3)r2 where key >=0 order by key
PREHOOK: type: QUERY
PREHOOK: Input: default@cbo_t1
Modified: hive/trunk/ql/src/test/results/clientpositive/tez/cbo_union.q.out
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/cbo_union.q.out?rev=1646055&r1=1646054&r2=1646055&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/cbo_union.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/cbo_union.q.out Tue Dec
16 19:37:13 2014
@@ -1,4 +1,6 @@
-PREHOOK: query: -- 11. Union All
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- 11. Union All
select * from cbo_t1 order by key, c_boolean, value, dt union all select *
from cbo_t2 order by key, c_boolean, value, dt
PREHOOK: type: QUERY
PREHOOK: Input: default@cbo_t1
@@ -6,7 +8,9 @@ PREHOOK: Input: default@cbo_t1@dt=2014
PREHOOK: Input: default@cbo_t2
PREHOOK: Input: default@cbo_t2@dt=2014
#### A masked pattern was here ####
-POSTHOOK: query: -- 11. Union All
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- 11. Union All
select * from cbo_t1 order by key, c_boolean, value, dt union all select *
from cbo_t2 order by key, c_boolean, value, dt
POSTHOOK: type: QUERY
POSTHOOK: Input: default@cbo_t1
@@ -16,8 +20,14 @@ POSTHOOK: Input: default@cbo_t2@dt=2014
#### A masked pattern was here ####
1 1 1 1.0 true 2014
1 1 1 1.0 true 2014
+ 1 1 1 1.0 true 2014
+ 1 1 1 1.0 true 2014
+ 1 1 1 1.0 true 2014
1 1 1 1.0 true 2014
1 1 1 1.0 true 2014
+ 1 1 1 1.0 true 2014
+1 1 1 1.0 false 2014
+1 1 1 1.0 false 2014
1 1 1 1.0 false 2014
1 1 1 1.0 false 2014
1 1 1 1.0 true 2014
@@ -30,16 +40,6 @@ POSTHOOK: Input: default@cbo_t2@dt=2014
1 1 1 1.0 true 2014
1 1 1 1.0 true 2014
1 1 1 1.0 true 2014
-1 1 1 1.0 true 2014
-1 1 1 1.0 true 2014
-null null NULL NULL NULL 2014
-null null NULL NULL NULL 2014
- 1 1 1 1.0 true 2014
- 1 1 1 1.0 true 2014
- 1 1 1 1.0 true 2014
- 1 1 1 1.0 true 2014
-1 1 1 1.0 false 2014
-1 1 1 1.0 false 2014
1 1 1 1.0 true 2014
1 1 1 1.0 true 2014
1 1 1 1.0 true 2014
@@ -47,6 +47,8 @@ null null NULL NULL NULL 2014
1 1 1 1.0 true 2014
1 1 1 1.0 true 2014
1 1 1 1.0 true 2014
+1 1 1 1.0 true 2014
+1 1 1 1.0 true 2014
2 2 2 2.0 true 2014
2 2 2 2.0 true 2014
2 2 2 2.0 true 2014
@@ -54,6 +56,8 @@ null null NULL NULL NULL 2014
2 2 2 2.0 true 2014
null null NULL NULL NULL 2014
null null NULL NULL NULL 2014
+null null NULL NULL NULL 2014
+null null NULL NULL NULL 2014
PREHOOK: query: select key from (select key, c_int from (select * from cbo_t1
union all select * from cbo_t2 where cbo_t2.key >=0)r1 union all select key,
c_int from cbo_t3)r2 where key >=0 order by key
PREHOOK: type: QUERY
PREHOOK: Input: default@cbo_t1
