You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2014/11/05 23:16:49 UTC
svn commit: r1636984 - in /hive/branches/branch-0.14/ql/src/test:
queries/clientpositive/cbo_correctness.q
results/clientpositive/cbo_correctness.q.out
results/clientpositive/tez/cbo_correctness.q.out
Author: sershe
Date: Wed Nov 5 22:16:48 2014
New Revision: 1636984
URL: http://svn.apache.org/r1636984
Log:
HIVE-8736 : add ordering to cbo_correctness to make result consistent (Sergey Shelukhin, reviewed by Laljo John Pullokkaran)
Modified:
hive/branches/branch-0.14/ql/src/test/queries/clientpositive/cbo_correctness.q
hive/branches/branch-0.14/ql/src/test/results/clientpositive/cbo_correctness.q.out
hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/cbo_correctness.q.out
Modified: hive/branches/branch-0.14/ql/src/test/queries/clientpositive/cbo_correctness.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/queries/clientpositive/cbo_correctness.q?rev=1636984&r1=1636983&r2=1636984&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/queries/clientpositive/cbo_correctness.q (original)
+++ hive/branches/branch-0.14/ql/src/test/queries/clientpositive/cbo_correctness.q Wed Nov 5 22:16:48 2014
@@ -251,7 +251,7 @@ drop view v3;
drop view v4;
-- 11. Union All
-select * from t1 union all select * from t2 order by key, c_boolean, value, dt;
+select * from t1 order by key, c_boolean, value, dt union all select * from t2 order by key, c_boolean, value, dt;
select key from (select key, c_int from (select * from t1 union all select * from t2 where t2.key >=0)r1 union all select key, c_int from t3)r2 where key >=0 order by key;
select r2.key from (select key, c_int from (select key, c_int from t1 union all select key, c_int from t3 )r1 union all select key, c_int from t3)r2 join (select key, c_int from (select * from t1 union all select * from t2 where t2.key >=0)r1 union all select key, c_int from t3)r3 on r2.key=r3.key where r3.key >=0 order by r2.key;
Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/cbo_correctness.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/cbo_correctness.q.out?rev=1636984&r1=1636983&r2=1636984&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/cbo_correctness.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/cbo_correctness.q.out Wed Nov 5 22:16:48 2014
@@ -16719,7 +16719,7 @@ POSTHOOK: type: DROPVIEW
POSTHOOK: Input: default@v4
POSTHOOK: Output: default@v4
PREHOOK: query: -- 11. Union All
-select * from t1 union all select * from t2 order by key, c_boolean, value, dt
+select * from t1 order by key, c_boolean, value, dt union all select * from t2 order by key, c_boolean, value, dt
PREHOOK: type: QUERY
PREHOOK: Input: default@t1
PREHOOK: Input: default@t1@dt=2014
@@ -16727,7 +16727,7 @@ PREHOOK: Input: default@t2
PREHOOK: Input: default@t2@dt=2014
#### A masked pattern was here ####
POSTHOOK: query: -- 11. Union All
-select * from t1 union all select * from t2 order by key, c_boolean, value, dt
+select * from t1 order by key, c_boolean, value, dt union all select * from t2 order by key, c_boolean, value, dt
POSTHOOK: type: QUERY
POSTHOOK: Input: default@t1
POSTHOOK: Input: default@t1@dt=2014
@@ -16745,33 +16745,33 @@ POSTHOOK: Input: default@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
-2 2 2 2.0 true 2014
-2 2 2 2.0 true 2014
-2 2 2 2.0 true 2014
-2 2 2 2.0 true 2014
-2 2 2 2.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 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
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
+2 2 2 2.0 true 2014
+2 2 2 2.0 true 2014
+2 2 2 2.0 true 2014
+2 2 2 2.0 true 2014
+2 2 2 2.0 true 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 t1 union all select * from t2 where t2.key >=0)r1 union all select key, c_int from t3)r2 where key >=0 order by key
Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/cbo_correctness.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/cbo_correctness.q.out?rev=1636984&r1=1636983&r2=1636984&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/cbo_correctness.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/cbo_correctness.q.out Wed Nov 5 22:16:48 2014
@@ -16719,7 +16719,7 @@ POSTHOOK: type: DROPVIEW
POSTHOOK: Input: default@v4
POSTHOOK: Output: default@v4
PREHOOK: query: -- 11. Union All
-select * from t1 union all select * from t2 order by key, c_boolean, value, dt
+select * from t1 order by key, c_boolean, value, dt union all select * from t2 order by key, c_boolean, value, dt
PREHOOK: type: QUERY
PREHOOK: Input: default@t1
PREHOOK: Input: default@t1@dt=2014
@@ -16727,13 +16727,19 @@ PREHOOK: Input: default@t2
PREHOOK: Input: default@t2@dt=2014
#### A masked pattern was here ####
POSTHOOK: query: -- 11. Union All
-select * from t1 union all select * from t2 order by key, c_boolean, value, dt
+select * from t1 order by key, c_boolean, value, dt union all select * from t2 order by key, c_boolean, value, dt
POSTHOOK: type: QUERY
POSTHOOK: Input: default@t1
POSTHOOK: Input: default@t1@dt=2014
POSTHOOK: Input: default@t2
POSTHOOK: Input: default@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 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
@@ -16744,14 +16750,8 @@ POSTHOOK: Input: default@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
- 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
null null NULL NULL NULL 2014
null null NULL NULL NULL 2014
1 1 1 1.0 true 2014