You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2014/04/08 02:19:44 UTC
svn commit: r1585632 [1/13] - in /hive/branches/branch-0.13/ql/src/test:
queries/clientpositive/ results/clientpositive/ results/clientpositive/tez/
Author: hashutosh
Date: Tue Apr 8 00:19:43 2014
New Revision: 1585632
URL: http://svn.apache.org/r1585632
Log:
HIVE-6821 : Fix some non-deterministic tests (Jason Dere via Ashutosh Chauhan)
Modified:
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/avro_partitioned.q
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/compile_processor.q
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/list_bucket_dml_2.q
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/list_bucket_dml_4.q
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part1.q
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part10.q
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part3.q
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part4.q
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part8.q
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part9.q
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/merge3.q
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/merge4.q
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/mi.q
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/orc_create.q
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/parquet_partitioned.q
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/stats4.q
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/subquery_in.q
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/subquery_in_having.q
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/subquery_views.q
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/union_top_level.q
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/vectorization_15.q
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/vectorization_part_project.q
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/vectorized_rcfile_columnar.q
hive/branches/branch-0.13/ql/src/test/queries/clientpositive/vectorized_timestamp_funcs.q
hive/branches/branch-0.13/ql/src/test/results/clientpositive/avro_partitioned.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/compile_processor.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/load_dyn_part1.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/load_dyn_part10.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/load_dyn_part3.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/load_dyn_part4.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/load_dyn_part8.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/load_dyn_part9.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/merge3.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/merge4.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/mi.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/orc_create.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/parquet_partitioned.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/stats4.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/subquery_in.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/subquery_in_having.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/subquery_views.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/tez/load_dyn_part1.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/tez/load_dyn_part3.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/tez/subquery_in.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/tez/vectorization_15.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/union_top_level.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/vectorization_15.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/vectorization_part_project.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/vectorized_rcfile_columnar.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/avro_partitioned.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/avro_partitioned.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/avro_partitioned.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/avro_partitioned.q Tue Apr 8 00:19:43 2014
@@ -66,7 +66,7 @@ INSERT OVERWRITE TABLE episodes_partitio
SELECT * FROM episodes_partitioned WHERE doctor_pt > 6 ORDER BY air_date;
-- Verify that Fetch works in addition to Map
-SELECT * FROM episodes_partitioned LIMIT 5;
+SELECT * FROM episodes_partitioned ORDER BY air_date LIMIT 5;
-- Fetch w/filter to specific partition
SELECT * FROM episodes_partitioned WHERE doctor_pt = 6;
-- Fetch w/non-existant partition
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/compile_processor.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/compile_processor.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/compile_processor.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/compile_processor.q Tue Apr 8 00:19:43 2014
@@ -9,3 +9,4 @@ CREATE TEMPORARY FUNCTION Pyth as 'Pyth'
SELECT Pyth(3,4) FROM src tablesample (1 rows);
+DROP TEMPORARY FUNCTION Pyth;
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/list_bucket_dml_2.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/list_bucket_dml_2.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/list_bucket_dml_2.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/list_bucket_dml_2.q Tue Apr 8 00:19:43 2014
@@ -48,13 +48,13 @@ set hive.optimize.listbucketing=true;
explain extended
select * from list_bucketing_static_part where ds = '2008-04-08' and hr = '11' and key = '484' and value = 'val_484' ORDER BY key, value, ds, hr;
select * from list_bucketing_static_part where ds = '2008-04-08' and hr = '11' and key = '484' and value = 'val_484' ORDER BY key, value, ds, hr;
-select * from srcpart where ds = '2008-04-08' and key = '484' and value = 'val_484' ORDER BY key, value;
+select * from srcpart where ds = '2008-04-08' and key = '484' and value = 'val_484' ORDER BY key, value, ds, hr;
-- 51 and val_51 in the table so skewed data for 51 and val_14 should be none
-- but query should succeed for 51 or 51 and val_14
-select * from srcpart where ds = '2008-04-08' and key = '51' ORDER BY key, value;
+select * from srcpart where ds = '2008-04-08' and key = '51' ORDER BY key, value, ds, hr;
select * from list_bucketing_static_part where key = '51' ORDER BY key, value, ds, hr;
-select * from srcpart where ds = '2008-04-08' and key = '51' and value = 'val_14' ORDER BY key, value;
+select * from srcpart where ds = '2008-04-08' and key = '51' and value = 'val_14' ORDER BY key, value, ds, hr;
select * from list_bucketing_static_part where key = '51' and value = 'val_14' ORDER BY key, value, ds, hr;
-- queries with < <= > >= should work for skewed test although we don't benefit from pruning
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/list_bucket_dml_4.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/list_bucket_dml_4.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/list_bucket_dml_4.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/list_bucket_dml_4.q Tue Apr 8 00:19:43 2014
@@ -65,7 +65,7 @@ set hive.optimize.listbucketing=true;
explain extended
select * from list_bucketing_static_part where ds = '2008-04-08' and hr = '11' and key = '484' and value = 'val_484' ORDER BY key, value, ds, hr;
select * from list_bucketing_static_part where ds = '2008-04-08' and hr = '11' and key = '484' and value = 'val_484' ORDER BY key, value, ds, hr;
-select * from srcpart where ds = '2008-04-08' and key = '484' and value = 'val_484' ORDER BY key, value;
+select * from srcpart where ds = '2008-04-08' and key = '484' and value = 'val_484' ORDER BY key, value, ds, hr;
-- clean up
drop table list_bucketing_static_part;
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part1.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part1.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part1.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part1.q Tue Apr 8 00:19:43 2014
@@ -23,8 +23,8 @@ insert overwrite table nzhang_part2 part
show partitions nzhang_part1;
show partitions nzhang_part2;
-select * from nzhang_part1 where ds is not null and hr is not null;
-select * from nzhang_part2 where ds is not null and hr is not null;
+select * from nzhang_part1 where ds is not null and hr is not null order by ds, hr, key;
+select * from nzhang_part2 where ds is not null and hr is not null order by ds, hr, key;
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part10.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part10.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part10.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part10.q Tue Apr 8 00:19:43 2014
@@ -19,6 +19,6 @@ insert overwrite table nzhang_part10 par
show partitions nzhang_part10;
-select * from nzhang_part10 where ds is not null and hr is not null;
+select * from nzhang_part10 where ds is not null and hr is not null order by ds, hr, key;
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part3.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part3.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part3.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part3.q Tue Apr 8 00:19:43 2014
@@ -14,6 +14,6 @@ insert overwrite table nzhang_part3 part
insert overwrite table nzhang_part3 partition (ds, hr) select key, value, ds, hr from srcpart where ds is not null and hr is not null;
-select * from nzhang_part3 where ds is not null and hr is not null;
+select * from nzhang_part3 where ds is not null and hr is not null order by ds, hr, key;
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part4.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part4.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part4.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part4.q Tue Apr 8 00:19:43 2014
@@ -17,8 +17,8 @@ insert overwrite table nzhang_part4 part
insert overwrite table nzhang_part4 partition (ds, hr) select key, value, ds, hr from srcpart where ds is not null and hr is not null;
show partitions nzhang_part4;
-select * from nzhang_part4 where ds='2008-04-08' and hr is not null;
+select * from nzhang_part4 where ds='2008-04-08' and hr is not null order by ds, hr, key;
-select * from nzhang_part4 where ds is not null and hr is not null;
+select * from nzhang_part4 where ds is not null and hr is not null order by ds, hr, key;
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part8.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part8.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part8.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part8.q Tue Apr 8 00:19:43 2014
@@ -20,5 +20,5 @@ insert overwrite table nzhang_part8 part
show partitions nzhang_part8;
-select * from nzhang_part8 where ds is not null and hr is not null;
+select * from nzhang_part8 where ds is not null and hr is not null order by ds, hr, key;
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part9.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part9.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part9.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/load_dyn_part9.q Tue Apr 8 00:19:43 2014
@@ -19,5 +19,5 @@ insert overwrite table nzhang_part9 part
show partitions nzhang_part9;
-select * from nzhang_part9 where ds is not null and hr is not null;
+select * from nzhang_part9 where ds is not null and hr is not null order by ds, hr, key;
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/merge3.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/merge3.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/merge3.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/merge3.q Tue Apr 8 00:19:43 2014
@@ -37,7 +37,7 @@ where ds is not null;
show partitions merge_src_part2;
-select * from merge_src_part2 where ds is not null ORDER BY key ASC, value ASC;
+select * from merge_src_part2 where ds is not null ORDER BY key ASC, value ASC, ds ASC;
drop table merge_src_part2;
@@ -54,4 +54,4 @@ select key, value, ds;
show partitions merge_src_part2;
-select * from merge_src_part2 where ds is not null ORDER BY key ASC, value ASC;
+select * from merge_src_part2 where ds is not null ORDER BY key ASC, value ASC, ds ASC;
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/merge4.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/merge4.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/merge4.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/merge4.q Tue Apr 8 00:19:43 2014
@@ -11,14 +11,14 @@ insert overwrite table nzhang_part parti
insert overwrite table nzhang_part partition (ds='2010-08-15', hr) select key, value, hr from srcpart where ds='2008-04-08';
-select * from nzhang_part;
+select * from nzhang_part ORDER BY key, value, ds, hr;
explain
insert overwrite table nzhang_part partition (ds='2010-08-15', hr=11) select key, value from srcpart where ds='2008-04-08';
insert overwrite table nzhang_part partition (ds='2010-08-15', hr=11) select key, value from srcpart where ds='2008-04-08';
-select * from nzhang_part;
+select * from nzhang_part ORDER BY key, value, ds, hr;
explain
insert overwrite table nzhang_part partition (ds='2010-08-15', hr)
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/mi.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/mi.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/mi.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/mi.q Tue Apr 8 00:19:43 2014
@@ -15,7 +15,7 @@ GROUP BY key, value, ds, hr;
show partitions nzhang_t1;
show partitions nzhang_t2;
-select * from nzhang_t1;
-select * from nzhang_t2;
+select * from nzhang_t1 order by key, value;
+select * from nzhang_t2 order by key, value;
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/orc_create.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/orc_create.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/orc_create.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/orc_create.q Tue Apr 8 00:19:43 2014
@@ -114,7 +114,8 @@ SELECT COUNT(*) FROM orc_create_people w
-- test predicate push down with no column projection
SELECT id, first_name, last_name, address
- FROM orc_create_people WHERE id > 90;
+ FROM orc_create_people WHERE id > 90
+ ORDER BY id, first_name, last_name;
DROP TABLE orc_create;
DROP TABLE orc_create_complex;
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/parquet_partitioned.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/parquet_partitioned.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/parquet_partitioned.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/parquet_partitioned.q Tue Apr 8 00:19:43 2014
@@ -26,9 +26,9 @@ SELECT * FROM parquet_partitioned_stagin
INSERT OVERWRITE TABLE parquet_partitioned PARTITION (part) SELECT * FROM parquet_partitioned_staging;
set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SELECT * FROM parquet_partitioned;
+SELECT * FROM parquet_partitioned ORDER BY id, str;
SELECT part, COUNT(0) FROM parquet_partitioned GROUP BY part;
set hive.input.format=org.apache.hadoop.hive.ql.io.CombineHiveInputFormat;
-SELECT * FROM parquet_partitioned;
+SELECT * FROM parquet_partitioned ORDER BY id, str;
SELECT part, COUNT(0) FROM parquet_partitioned GROUP BY part;
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/stats4.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/stats4.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/stats4.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/stats4.q Tue Apr 8 00:19:43 2014
@@ -25,8 +25,8 @@ insert overwrite table nzhang_part2 part
show partitions nzhang_part1;
show partitions nzhang_part2;
-select * from nzhang_part1 where ds is not null and hr is not null;
-select * from nzhang_part2 where ds is not null and hr is not null;
+select * from nzhang_part1 where ds is not null and hr is not null order by ds, hr, key;
+select * from nzhang_part2 where ds is not null and hr is not null order by ds, hr, key;
describe formatted nzhang_part1 partition(ds='2008-04-08',hr=11);
describe formatted nzhang_part1 partition(ds='2008-04-08',hr=12);
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/subquery_in.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/subquery_in.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/subquery_in.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/subquery_in.q Tue Apr 8 00:19:43 2014
@@ -47,6 +47,7 @@ where src.key in (select key from src s1
select *
from src
where src.key in (select key from src s1 where s1.key > '9')
+order by key
;
-- non agg, corr
@@ -67,6 +68,7 @@ where b.key in
from src a
where b.value = a.value and a.key > '9'
)
+order by b.key
;
-- agg, non corr
@@ -86,6 +88,7 @@ part where part.p_size in
from (select p_size, rank() over(partition by p_mfgr order by p_size) as r from part) a
where r <= 2
)
+order by p_name
;
-- agg, corr
@@ -104,6 +107,7 @@ from part b where b.p_size in
from (select p_mfgr, p_size, rank() over(partition by p_mfgr order by p_size) as r from part) a
where r <= 2 and b.p_mfgr = a.p_mfgr
)
+order by p_mfgr, p_name, p_size
;
-- distinct, corr
@@ -124,6 +128,7 @@ where b.key in
from src a
where b.value = a.value and a.key > '9'
)
+order by b.key
;
-- non agg, non corr, windowing
@@ -131,6 +136,7 @@ select p_mfgr, p_name, p_size
from part
where part.p_size in
(select first_value(p_size) over(partition by p_mfgr order by p_size) from part)
+order by p_mfgr, p_name, p_size
;
-- non agg, non corr, with join in Parent Query
@@ -145,6 +151,7 @@ select p.p_partkey, li.l_suppkey
from (select distinct l_partkey as p_partkey from lineitem) p join lineitem li on p.p_partkey = li.l_partkey
where li.l_linenumber = 1 and
li.l_orderkey in (select l_orderkey from lineitem where l_shipmode = 'AIR')
+order by p.p_partkey, li.l_suppkey
;
-- non agg, corr, with join in Parent Query
@@ -152,4 +159,5 @@ select p.p_partkey, li.l_suppkey
from (select distinct l_partkey as p_partkey from lineitem) p join lineitem li on p.p_partkey = li.l_partkey
where li.l_linenumber = 1 and
li.l_orderkey in (select l_orderkey from lineitem where l_shipmode = 'AIR' and l_linenumber = li.l_linenumber)
+order by p.p_partkey, li.l_suppkey
;
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/subquery_in_having.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/subquery_in_having.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/subquery_in_having.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/subquery_in_having.q Tue Apr 8 00:19:43 2014
@@ -23,12 +23,13 @@ having count(*) in (select count(*) from
;
-select s1.key, count(*) from src s1 where s1.key > '9' group by s1.key;
+select s1.key, count(*) from src s1 where s1.key > '9' group by s1.key order by s1.key;
select key, count(*)
from src
group by key
having count(*) in (select count(*) from src s1 where s1.key = '90' group by s1.key )
+order by key
;
-- non agg, corr
@@ -60,6 +61,7 @@ having b.key in ( select a.key
from src a
where a.value > 'val_9' and a.value = min(b.value)
)
+order by b.key
;
-- where and having
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/subquery_views.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/subquery_views.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/subquery_views.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/subquery_views.q Tue Apr 8 00:19:43 2014
@@ -11,7 +11,7 @@ where exists
;
select *
-from cv1 where cv1.key in (select key from cv1 c where c.key > '95');
+from cv1 where cv1.key in (select key from cv1 c where c.key > '95') order by key;
;
@@ -27,7 +27,7 @@ where b.key not in
;
select *
-from cv2 where cv2.key in (select key from cv2 c where c.key < '11');
+from cv2 where cv2.key in (select key from cv2 c where c.key < '11') order by key;
;
-- in where + having
@@ -39,10 +39,10 @@ group by key, value
having count(*) in (select count(*) from src s1 where s1.key > '9' group by s1.key )
;
-select * from cv3;
+select * from cv3 order by key;
-- join of subquery views
select *
from cv3
-where cv3.key in (select key from cv1);
\ No newline at end of file
+where cv3.key in (select key from cv1) order by key;
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/union_top_level.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/union_top_level.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/union_top_level.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/union_top_level.q Tue Apr 8 00:19:43 2014
@@ -1,25 +1,33 @@
-- top level
explain
+select * from (
select key, 0 as value from src where key % 3 == 0 limit 3
union all
select key, 1 as value from src where key % 3 == 1 limit 3
union all
-select key, 2 as value from src where key % 3 == 2 limit 3;
+select key, 2 as value from src where key % 3 == 2 limit 3
+) q1 order by key;
+select * from (
select key, 0 as value from src where key % 3 == 0 limit 3
union all
select key, 1 as value from src where key % 3 == 1 limit 3
union all
-select key, 2 as value from src where key % 3 == 2 limit 3;
+select key, 2 as value from src where key % 3 == 2 limit 3
+) q1 order by key;
explain
+select * from (
select s1.key as k, s2.value as v from src s1 join src s2 on (s1.key = s2.key) limit 10
union all
-select s1.key as k, s2.value as v from src s1 join src s2 on (s1.key = s2.key) limit 10;
+select s1.key as k, s2.value as v from src s1 join src s2 on (s1.key = s2.key) limit 10
+) q1 order by k;
+select * from (
select s1.key as k, s2.value as v from src s1 join src s2 on (s1.key = s2.key) limit 10
union all
-select s1.key as k, s2.value as v from src s1 join src s2 on (s1.key = s2.key) limit 10;
+select s1.key as k, s2.value as v from src s1 join src s2 on (s1.key = s2.key) limit 10
+) q1 order by k;
-- ctas
explain
@@ -37,7 +45,7 @@ select key, 1 as value from src where ke
union all
select key, 2 as value from src where key % 3 == 2 limit 3;
-select * from union_top;
+select * from union_top order by key;
truncate table union_top;
@@ -57,7 +65,7 @@ select key, 1 as value from src where ke
union all
select key, 2 as value from src where key % 3 == 2 limit 3;
-select * from union_top;
+select * from union_top order by key;
explain
insert overwrite table union_top
@@ -74,7 +82,7 @@ select key, 1 as value from src where ke
union all
select key, 2 as value from src where key % 3 == 2 limit 3;
-select * from union_top;
+select * from union_top order by key;
-- create view
explain
@@ -92,7 +100,7 @@ select key, 1 as value from src where ke
union all
select key, 2 as value from src where key % 3 == 2 limit 3;
-select * from union_top_view;
+select * from union_top_view order by key;
drop table union_top;
drop view union_top_view;
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/vectorization_15.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/vectorization_15.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/vectorization_15.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/vectorization_15.q Tue Apr 8 00:19:43 2014
@@ -26,5 +26,6 @@ WHERE (((cstring2 LIKE '%ss%')
OR ((cint >= -75)
AND ((ctinyint = csmallint)
AND (cdouble >= -3728))))
-GROUP BY cfloat, cboolean1, cdouble, cstring1, ctinyint, cint, ctimestamp1;
+GROUP BY cfloat, cboolean1, cdouble, cstring1, ctinyint, cint, ctimestamp1
+ORDER BY cfloat, cboolean1, cdouble, cstring1, ctinyint, cint, ctimestamp1;
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/vectorization_part_project.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/vectorization_part_project.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/vectorization_part_project.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/vectorization_part_project.q Tue Apr 8 00:19:43 2014
@@ -3,5 +3,5 @@ CREATE TABLE alltypesorc_part(ctinyint t
insert overwrite table alltypesorc_part partition (ds='2011') select * from alltypesorc limit 100;
insert overwrite table alltypesorc_part partition (ds='2012') select * from alltypesorc limit 100;
-explain select (cdouble+2) from alltypesorc_part limit 10;
-select (cdouble+2) from alltypesorc_part limit 10;
+explain select (cdouble+2) c1 from alltypesorc_part order by c1 limit 10;
+select (cdouble+2) c1 from alltypesorc_part order by c1 limit 10;
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/vectorized_rcfile_columnar.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/vectorized_rcfile_columnar.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/vectorized_rcfile_columnar.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/vectorized_rcfile_columnar.q Tue Apr 8 00:19:43 2014
@@ -14,5 +14,5 @@ describe columnTable;
SET hive.vectorized.execution.enabled=true;
-SELECT key, value FROM columnTable;
+SELECT key, value FROM columnTable ORDER BY key;
Modified: hive/branches/branch-0.13/ql/src/test/queries/clientpositive/vectorized_timestamp_funcs.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/queries/clientpositive/vectorized_timestamp_funcs.q?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/queries/clientpositive/vectorized_timestamp_funcs.q (original)
+++ hive/branches/branch-0.13/ql/src/test/queries/clientpositive/vectorized_timestamp_funcs.q Tue Apr 8 00:19:43 2014
@@ -18,7 +18,7 @@ INSERT INTO TABLE alltypesorc_wrong SELE
INSERT INTO TABLE alltypesorc_wrong SELECT '0000-00-00 99:99:99' FROM alltypesorc LIMIT 1;
EXPLAIN SELECT
- to_unix_timestamp(ctimestamp1),
+ to_unix_timestamp(ctimestamp1) AS c1,
year(ctimestamp1),
month(ctimestamp1),
day(ctimestamp1),
@@ -27,10 +27,11 @@ EXPLAIN SELECT
hour(ctimestamp1),
minute(ctimestamp1),
second(ctimestamp1)
-FROM alltypesorc_string;
+FROM alltypesorc_string
+ORDER BY c1;
SELECT
- to_unix_timestamp(ctimestamp1),
+ to_unix_timestamp(ctimestamp1) AS c1,
year(ctimestamp1),
month(ctimestamp1),
day(ctimestamp1),
@@ -39,10 +40,11 @@ SELECT
hour(ctimestamp1),
minute(ctimestamp1),
second(ctimestamp1)
-FROM alltypesorc_string;
+FROM alltypesorc_string
+ORDER BY c1;
EXPLAIN SELECT
- to_unix_timestamp(stimestamp1),
+ to_unix_timestamp(stimestamp1) AS c1,
year(stimestamp1),
month(stimestamp1),
day(stimestamp1),
@@ -51,10 +53,11 @@ EXPLAIN SELECT
hour(stimestamp1),
minute(stimestamp1),
second(stimestamp1)
-FROM alltypesorc_string;
+FROM alltypesorc_string
+ORDER BY c1;
SELECT
- to_unix_timestamp(stimestamp1),
+ to_unix_timestamp(stimestamp1) AS c1,
year(stimestamp1),
month(stimestamp1),
day(stimestamp1),
@@ -63,10 +66,11 @@ SELECT
hour(stimestamp1),
minute(stimestamp1),
second(stimestamp1)
-FROM alltypesorc_string;
+FROM alltypesorc_string
+ORDER BY c1;
EXPLAIN SELECT
- to_unix_timestamp(ctimestamp1) = to_unix_timestamp(stimestamp1),
+ to_unix_timestamp(ctimestamp1) = to_unix_timestamp(stimestamp1) AS c1,
year(ctimestamp1) = year(stimestamp1),
month(ctimestamp1) = month(stimestamp1),
day(ctimestamp1) = day(stimestamp1),
@@ -75,11 +79,12 @@ EXPLAIN SELECT
hour(ctimestamp1) = hour(stimestamp1),
minute(ctimestamp1) = minute(stimestamp1),
second(ctimestamp1) = second(stimestamp1)
-FROM alltypesorc_string;
+FROM alltypesorc_string
+ORDER BY c1;
-- Should all be true or NULL
SELECT
- to_unix_timestamp(ctimestamp1) = to_unix_timestamp(stimestamp1),
+ to_unix_timestamp(ctimestamp1) = to_unix_timestamp(stimestamp1) AS c1,
year(ctimestamp1) = year(stimestamp1),
month(ctimestamp1) = month(stimestamp1),
day(ctimestamp1) = day(stimestamp1),
@@ -88,11 +93,12 @@ SELECT
hour(ctimestamp1) = hour(stimestamp1),
minute(ctimestamp1) = minute(stimestamp1),
second(ctimestamp1) = second(stimestamp1)
-FROM alltypesorc_string;
+FROM alltypesorc_string
+ORDER BY c1;
-- Wrong format. Should all be NULL.
EXPLAIN SELECT
- to_unix_timestamp(stimestamp1),
+ to_unix_timestamp(stimestamp1) AS c1,
year(stimestamp1),
month(stimestamp1),
day(stimestamp1),
@@ -101,10 +107,11 @@ EXPLAIN SELECT
hour(stimestamp1),
minute(stimestamp1),
second(stimestamp1)
-FROM alltypesorc_wrong;
+FROM alltypesorc_wrong
+ORDER BY c1;
SELECT
- to_unix_timestamp(stimestamp1),
+ to_unix_timestamp(stimestamp1) AS c1,
year(stimestamp1),
month(stimestamp1),
day(stimestamp1),
@@ -113,4 +120,5 @@ SELECT
hour(stimestamp1),
minute(stimestamp1),
second(stimestamp1)
-FROM alltypesorc_wrong;
+FROM alltypesorc_wrong
+ORDER BY c1;
Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/avro_partitioned.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/avro_partitioned.q.out?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/results/clientpositive/avro_partitioned.q.out (original)
+++ hive/branches/branch-0.13/ql/src/test/results/clientpositive/avro_partitioned.q.out Tue Apr 8 00:19:43 2014
@@ -204,7 +204,7 @@ The Doctor's Wife 14 May 2011 11 11
Rose 26 March 2005 9 9
The Eleventh Hour 3 April 2010 11 11
PREHOOK: query: -- Verify that Fetch works in addition to Map
-SELECT * FROM episodes_partitioned LIMIT 5
+SELECT * FROM episodes_partitioned ORDER BY air_date LIMIT 5
PREHOOK: type: QUERY
PREHOOK: Input: default@episodes_partitioned
PREHOOK: Input: default@episodes_partitioned@doctor_pt=1
@@ -216,7 +216,7 @@ PREHOOK: Input: default@episodes_partiti
PREHOOK: Input: default@episodes_partitioned@doctor_pt=9
#### A masked pattern was here ####
POSTHOOK: query: -- Verify that Fetch works in addition to Map
-SELECT * FROM episodes_partitioned LIMIT 5
+SELECT * FROM episodes_partitioned ORDER BY air_date LIMIT 5
POSTHOOK: type: QUERY
POSTHOOK: Input: default@episodes_partitioned
POSTHOOK: Input: default@episodes_partitioned@doctor_pt=1
@@ -248,10 +248,10 @@ POSTHOOK: Lineage: episodes_partitioned
POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=9).air_date SIMPLE [(episodes)episodes.FieldSchema(name:air_date, type:string, comment:from deserializer), ]
POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=9).doctor SIMPLE [(episodes)episodes.FieldSchema(name:doctor, type:int, comment:from deserializer), ]
POSTHOOK: Lineage: episodes_partitioned PARTITION(doctor_pt=9).title SIMPLE [(episodes)episodes.FieldSchema(name:title, type:string, comment:from deserializer), ]
+The Doctor's Wife 14 May 2011 11 11
An Unearthly Child 23 November 1963 1 1
+Rose 26 March 2005 9 9
The Eleventh Hour 3 April 2010 11 11
-The Doctor's Wife 14 May 2011 11 11
-The Power of the Daleks 5 November 1966 2 2
Horror of Fang Rock 3 September 1977 4 4
PREHOOK: query: -- Fetch w/filter to specific partition
SELECT * FROM episodes_partitioned WHERE doctor_pt = 6
Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/compile_processor.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/compile_processor.q.out?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/results/clientpositive/compile_processor.q.out (original)
+++ hive/branches/branch-0.13/ql/src/test/results/clientpositive/compile_processor.q.out Tue Apr 8 00:19:43 2014
@@ -13,3 +13,9 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@src
#### A masked pattern was here ####
5.0
+PREHOOK: query: DROP TEMPORARY FUNCTION Pyth
+PREHOOK: type: DROPFUNCTION
+PREHOOK: Output: database:default
+POSTHOOK: query: DROP TEMPORARY FUNCTION Pyth
+POSTHOOK: type: DROPFUNCTION
+POSTHOOK: Output: database:default
Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
Files hive/branches/branch-0.13/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out (original) and hive/branches/branch-0.13/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out Tue Apr 8 00:19:43 2014 differ
Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out?rev=1585632&r1=1585631&r2=1585632&view=diff
==============================================================================
Files hive/branches/branch-0.13/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out (original) and hive/branches/branch-0.13/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out Tue Apr 8 00:19:43 2014 differ