diff --git a/ql/src/test/queries/clientpositive/alter_merge_2_orc.q b/ql/src/test/queries/clientpositive/alter_merge_2_orc.q index 580b535..990ae6b 100644 --- a/ql/src/test/queries/clientpositive/alter_merge_2_orc.q +++ b/ql/src/test/queries/clientpositive/alter_merge_2_orc.q @@ -3,9 +3,9 @@ create table src_orc_merge_test_part(key int, value string) partitioned by (ds s alter table src_orc_merge_test_part add partition (ds='2012-01-03', ts='2012-01-03+14:46:31'); desc extended src_orc_merge_test_part partition (ds='2012-01-03', ts='2012-01-03+14:46:31'); -insert overwrite table src_orc_merge_test_part partition(ds='2012-01-03', ts='2012-01-03+14:46:31') select * from src; -insert into table src_orc_merge_test_part partition(ds='2012-01-03', ts='2012-01-03+14:46:31') select * from src limit 100; -insert into table src_orc_merge_test_part partition(ds='2012-01-03', ts='2012-01-03+14:46:31') select * from src limit 10; +insert overwrite table src_orc_merge_test_part partition(ds='2012-01-03', ts='2012-01-03+14:46:31') select * from src order by key, value; +insert into table src_orc_merge_test_part partition(ds='2012-01-03', ts='2012-01-03+14:46:31') select * from src order by key, value limit 100; +insert into table src_orc_merge_test_part partition(ds='2012-01-03', ts='2012-01-03+14:46:31') select * from src order by key, value limit 10; select count(1) from src_orc_merge_test_part where ds='2012-01-03' and ts='2012-01-03+14:46:31'; select sum(hash(key)), sum(hash(value)) from src_orc_merge_test_part where ds='2012-01-03' and ts='2012-01-03+14:46:31'; diff --git a/ql/src/test/queries/clientpositive/auto_join0.q b/ql/src/test/queries/clientpositive/auto_join0.q index 84731db..cb4e541 100644 --- a/ql/src/test/queries/clientpositive/auto_join0.q +++ b/ql/src/test/queries/clientpositive/auto_join0.q @@ -6,9 +6,9 @@ select sum(hash(a.k1,a.v1,a.k2, a.v2)) from ( SELECT src1.key as k1, src1.value as v1, src2.key as k2, src2.value as v2 FROM - (SELECT * FROM src WHERE src.key < 10) src1 + (SELECT * FROM src WHERE src.key < 10 order by src.key, src.value) src1 JOIN - (SELECT * FROM src WHERE src.key < 10) src2 + (SELECT * FROM src WHERE src.key < 10 order by src.key, src.value) src2 SORT BY k1, v1, k2, v2 ) a; @@ -16,8 +16,8 @@ select sum(hash(a.k1,a.v1,a.k2, a.v2)) from ( SELECT src1.key as k1, src1.value as v1, src2.key as k2, src2.value as v2 FROM - (SELECT * FROM src WHERE src.key < 10) src1 + (SELECT * FROM src WHERE src.key < 10 order by src.key, src.value) src1 JOIN - (SELECT * FROM src WHERE src.key < 10) src2 + (SELECT * FROM src WHERE src.key < 10 order by src.key, src.value) src2 SORT BY k1, v1, k2, v2 ) a; diff --git a/ql/src/test/queries/clientpositive/auto_join1.q b/ql/src/test/queries/clientpositive/auto_join1.q index 2062a28..192311c 100644 --- a/ql/src/test/queries/clientpositive/auto_join1.q +++ b/ql/src/test/queries/clientpositive/auto_join1.q @@ -3,10 +3,10 @@ set hive.auto.convert.join =true; CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE; explain -FROM src src1 JOIN src src2 ON (src1.key = src2.key) +FROM src src1 JOIN src src2 ON (src1.key = src2.key) ORDER BY src1.key, src2.value INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value; -FROM src src1 JOIN src src2 ON (src1.key = src2.key) +FROM src src1 JOIN src src2 ON (src1.key = src2.key) ORDER BY src2.key, src2.value INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value; SELECT sum(hash(dest_j1.key,dest_j1.value)) FROM dest_j1; \ No newline at end of file diff --git a/ql/src/test/queries/clientpositive/cross_product_check_1.q b/ql/src/test/queries/clientpositive/cross_product_check_1.q index fb38c94..e773046 100644 --- a/ql/src/test/queries/clientpositive/cross_product_check_1.q +++ b/ql/src/test/queries/clientpositive/cross_product_check_1.q @@ -14,13 +14,13 @@ explain select * from B d1 join B d2 on d1.key = d2.key join A; explain select * from A join (select d1.key - from B d1 join B d2 on d1.key = d2.key + from B d1 join B d2 on d1.key = d2.key order by d1.key where 1 = 1 group by d1.key) od1; -explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1; +explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 order by d1.key group by d1.key) od1; explain select * from -(select A.key from A group by key) ss join -(select d1.key from B d1 join B d2 on d1.key = d2.key where 1 = 1 group by d1.key) od1; +(select A.key from A order by A.key group by key) ss join +(select d1.key from B d1 join B d2 on d1.key = d2.key where 1 = 1 order by d1.key group by d1.key) od1; diff --git a/ql/src/test/queries/clientpositive/cross_product_check_2.q b/ql/src/test/queries/clientpositive/cross_product_check_2.q index 479d571..df2a475 100644 --- a/ql/src/test/queries/clientpositive/cross_product_check_2.q +++ b/ql/src/test/queries/clientpositive/cross_product_check_2.q @@ -2,7 +2,7 @@ create table A as select * from src; create table B as -select * from src +select * from src order by key limit 10; set hive.auto.convert.join=true; diff --git a/ql/src/test/queries/clientpositive/insert_into1.q b/ql/src/test/queries/clientpositive/insert_into1.q index f19506a..c60e1f2 100644 --- a/ql/src/test/queries/clientpositive/insert_into1.q +++ b/ql/src/test/queries/clientpositive/insert_into1.q @@ -3,16 +3,16 @@ DROP TABLE insert_into1; CREATE TABLE insert_into1 (key int, value string); -EXPLAIN INSERT INTO TABLE insert_into1 SELECT * from src LIMIT 100; -INSERT INTO TABLE insert_into1 SELECT * from src LIMIT 100; +EXPLAIN INSERT INTO TABLE insert_into1 SELECT * from src ORDER BY key LIMIT 100; +INSERT INTO TABLE insert_into1 SELECT * from src ORDER BY key LIMIT 100; SELECT SUM(HASH(c)) FROM ( SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM insert_into1 ) t; explain select count(*) from insert_into1; select count(*) from insert_into1; -EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src LIMIT 100; -INSERT INTO TABLE insert_into1 SELECT * FROM src LIMIT 100; +EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 100; +INSERT INTO TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 100; SELECT SUM(HASH(c)) FROM ( SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM insert_into1 ) t; @@ -21,8 +21,8 @@ explain SELECT COUNT(*) FROM insert_into1; select count(*) from insert_into1; -EXPLAIN INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src LIMIT 10; -INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src LIMIT 10; +EXPLAIN INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 10; +INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 10; SELECT SUM(HASH(c)) FROM ( SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM insert_into1 ) t; diff --git a/ql/src/test/queries/clientpositive/mapjoin_decimal.q b/ql/src/test/queries/clientpositive/mapjoin_decimal.q index e0babb9..7299808 100644 --- a/ql/src/test/queries/clientpositive/mapjoin_decimal.q +++ b/ql/src/test/queries/clientpositive/mapjoin_decimal.q @@ -26,12 +26,12 @@ CREATE TABLE t2(dec decimal(4,0)) STORED AS ORC; INSERT INTO TABLE t2 select dec from over1k; explain -select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec); +select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec; set hive.mapjoin.optimized.hashtable=false; -select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec); +select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec; set hive.mapjoin.optimized.hashtable=true; -select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec); +select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec; diff --git a/ql/src/test/queries/clientpositive/tez_schema_evolution.q b/ql/src/test/queries/clientpositive/tez_schema_evolution.q index 2f1c73f..4ccb396 100644 --- a/ql/src/test/queries/clientpositive/tez_schema_evolution.q +++ b/ql/src/test/queries/clientpositive/tez_schema_evolution.q @@ -1,14 +1,14 @@ create table test (key int, value string) partitioned by (p int) stored as textfile; -insert into table test partition (p=1) select * from src limit 10; +insert into table test partition (p=1) select * from src order by key limit 10; alter table test set fileformat orc; -insert into table test partition (p=2) select * from src limit 10; +insert into table test partition (p=2) select * from src order by key limit 10; describe test; -select * from test where p=1 and key > 0; -select * from test where p=2 and key > 0; -select * from test where key > 0; +select * from test where p=1 and key > 0 order by key; +select * from test where p=2 and key > 0 order by key; +select * from test where key > 0 order by key; diff --git a/ql/src/test/queries/clientpositive/vector_data_types.q b/ql/src/test/queries/clientpositive/vector_data_types.q index 61356fa..c7a9c4c 100644 --- a/ql/src/test/queries/clientpositive/vector_data_types.q +++ b/ql/src/test/queries/clientpositive/vector_data_types.q @@ -36,18 +36,18 @@ INSERT INTO TABLE over1korc SELECT * FROM over1k; SET hive.vectorized.execution.enabled=false; -EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20; +EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20; -SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20; +SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20; SELECT SUM(HASH(*)) -FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i) as q; +FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i) as q; SET hive.vectorized.execution.enabled=true; -EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20; +EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20; -SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20; +SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20; SELECT SUM(HASH(*)) -FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i) as q; \ No newline at end of file +FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i) as q; \ No newline at end of file diff --git a/ql/src/test/queries/clientpositive/vectorization_part_project.q b/ql/src/test/queries/clientpositive/vectorization_part_project.q index c68ce56..e925ea8 100644 --- a/ql/src/test/queries/clientpositive/vectorization_part_project.q +++ b/ql/src/test/queries/clientpositive/vectorization_part_project.q @@ -1,7 +1,7 @@ SET hive.vectorized.execution.enabled=true; CREATE TABLE alltypesorc_part(ctinyint tinyint, csmallint smallint, cint int, cbigint bigint, cfloat float, cdouble double, cstring1 string, cstring2 string, ctimestamp1 timestamp, ctimestamp2 timestamp, cboolean1 boolean, cboolean2 boolean) partitioned by (ds string) STORED AS ORC; -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; +insert overwrite table alltypesorc_part partition (ds='2011') select * from alltypesorc order by ctinyint, cint, cbigint limit 100; +insert overwrite table alltypesorc_part partition (ds='2012') select * from alltypesorc order by ctinyint, cint, cbigint limit 100; 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; diff --git a/ql/src/test/queries/clientpositive/vectorized_distinct_gby.q b/ql/src/test/queries/clientpositive/vectorized_distinct_gby.q index 6e62200..2553e9f 100644 --- a/ql/src/test/queries/clientpositive/vectorized_distinct_gby.q +++ b/ql/src/test/queries/clientpositive/vectorized_distinct_gby.q @@ -3,7 +3,7 @@ SET hive.vectorized.execution.enabled=true; SET hive.map.groupby.sorted=true; create table dtest(a int, b int) clustered by (a) sorted by (a) into 1 buckets stored as orc; -insert into table dtest select c,b from (select array(300,300,300,300,300) as a, 1 as b from src limit 1) y lateral view explode(a) t1 as c; +insert into table dtest select c,b from (select array(300,300,300,300,300) as a, 1 as b from src order by a limit 1) y lateral view explode(a) t1 as c; explain select sum(distinct a), count(distinct a) from dtest; select sum(distinct a), count(distinct a) from dtest; diff --git a/ql/src/test/queries/clientpositive/vectorized_rcfile_columnar.q b/ql/src/test/queries/clientpositive/vectorized_rcfile_columnar.q index 488d2f3..dc124b1 100644 --- a/ql/src/test/queries/clientpositive/vectorized_rcfile_columnar.q +++ b/ql/src/test/queries/clientpositive/vectorized_rcfile_columnar.q @@ -9,7 +9,7 @@ STORED AS OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileOutputFormat'; FROM src -INSERT OVERWRITE TABLE columnTable SELECT src.key, src.value LIMIT 10; +INSERT OVERWRITE TABLE columnTable SELECT src.key, src.value ORDER BY src.key, src.value LIMIT 10; describe columnTable; SET hive.vectorized.execution.enabled=true; diff --git a/ql/src/test/queries/clientpositive/vectorized_shufflejoin.q b/ql/src/test/queries/clientpositive/vectorized_shufflejoin.q index 6b60aa0..84c92f8 100644 --- a/ql/src/test/queries/clientpositive/vectorized_shufflejoin.q +++ b/ql/src/test/queries/clientpositive/vectorized_shufflejoin.q @@ -1,10 +1,10 @@ SET hive.vectorized.execution.enabled=true; SET hive.auto.convert.join=false; -EXPLAIN SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) +EXPLAIN SELECT COUNT(t1.cint) AS CNT, MAX(t2.cint) , MIN(t1.cint), AVG(t1.cint+t2.cint) FROM alltypesorc t1 - JOIN alltypesorc t2 ON t1.cint = t2.cint; + JOIN alltypesorc t2 ON t1.cint = t2.cint order by CNT; -SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) +SELECT COUNT(t1.cint), MAX(t2.cint) AS CNT, MIN(t1.cint), AVG(t1.cint+t2.cint) FROM alltypesorc t1 - JOIN alltypesorc t2 ON t1.cint = t2.cint; \ No newline at end of file + JOIN alltypesorc t2 ON t1.cint = t2.cint order by CNT; \ No newline at end of file diff --git a/ql/src/test/queries/clientpositive/vectorized_timestamp_funcs.q b/ql/src/test/queries/clientpositive/vectorized_timestamp_funcs.q index 8a2d5aa..8b4702e 100644 --- a/ql/src/test/queries/clientpositive/vectorized_timestamp_funcs.q +++ b/ql/src/test/queries/clientpositive/vectorized_timestamp_funcs.q @@ -7,9 +7,10 @@ CREATE TABLE alltypesorc_string(ctimestamp1 timestamp, stimestamp1 string) STORE INSERT OVERWRITE TABLE alltypesorc_string SELECT - to_utc_timestamp(ctimestamp1, 'America/Los_Angeles'), - CAST(to_utc_timestamp(ctimestamp1, 'America/Los_Angeles') AS STRING) + to_utc_timestamp(ctimestamp1, 'America/Los_Angeles') AS toutc, + CAST(to_utc_timestamp(ctimestamp1, 'America/Los_Angeles') AS STRING) as cst FROM alltypesorc +ORDER BY toutc, cst LIMIT 40; SET hive.vectorized.execution.enabled = true; diff --git a/ql/src/test/results/clientpositive/tez/alter_merge_2_orc.q.out b/ql/src/test/results/clientpositive/tez/alter_merge_2_orc.q.out index 1ccae8e..7e30942 100644 --- a/ql/src/test/results/clientpositive/tez/alter_merge_2_orc.q.out +++ b/ql/src/test/results/clientpositive/tez/alter_merge_2_orc.q.out @@ -31,31 +31,31 @@ ds string ts string #### A masked pattern was here #### -PREHOOK: query: insert overwrite table src_orc_merge_test_part partition(ds='2012-01-03', ts='2012-01-03+14:46:31') select * from src +PREHOOK: query: insert overwrite table src_orc_merge_test_part partition(ds='2012-01-03', ts='2012-01-03+14:46:31') select * from src order by key, value PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@src_orc_merge_test_part@ds=2012-01-03/ts=2012-01-03+14%3A46%3A31 -POSTHOOK: query: insert overwrite table src_orc_merge_test_part partition(ds='2012-01-03', ts='2012-01-03+14:46:31') select * from src +POSTHOOK: query: insert overwrite table src_orc_merge_test_part partition(ds='2012-01-03', ts='2012-01-03+14:46:31') select * from src order by key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@src_orc_merge_test_part@ds=2012-01-03/ts=2012-01-03+14%3A46%3A31 POSTHOOK: Lineage: src_orc_merge_test_part PARTITION(ds=2012-01-03,ts=2012-01-03+14:46:31).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: src_orc_merge_test_part PARTITION(ds=2012-01-03,ts=2012-01-03+14:46:31).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: insert into table src_orc_merge_test_part partition(ds='2012-01-03', ts='2012-01-03+14:46:31') select * from src limit 100 +PREHOOK: query: insert into table src_orc_merge_test_part partition(ds='2012-01-03', ts='2012-01-03+14:46:31') select * from src order by key, value limit 100 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@src_orc_merge_test_part@ds=2012-01-03/ts=2012-01-03+14%3A46%3A31 -POSTHOOK: query: insert into table src_orc_merge_test_part partition(ds='2012-01-03', ts='2012-01-03+14:46:31') select * from src limit 100 +POSTHOOK: query: insert into table src_orc_merge_test_part partition(ds='2012-01-03', ts='2012-01-03+14:46:31') select * from src order by key, value limit 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@src_orc_merge_test_part@ds=2012-01-03/ts=2012-01-03+14%3A46%3A31 POSTHOOK: Lineage: src_orc_merge_test_part PARTITION(ds=2012-01-03,ts=2012-01-03+14:46:31).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: src_orc_merge_test_part PARTITION(ds=2012-01-03,ts=2012-01-03+14:46:31).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: insert into table src_orc_merge_test_part partition(ds='2012-01-03', ts='2012-01-03+14:46:31') select * from src limit 10 +PREHOOK: query: insert into table src_orc_merge_test_part partition(ds='2012-01-03', ts='2012-01-03+14:46:31') select * from src order by key, value limit 10 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@src_orc_merge_test_part@ds=2012-01-03/ts=2012-01-03+14%3A46%3A31 -POSTHOOK: query: insert into table src_orc_merge_test_part partition(ds='2012-01-03', ts='2012-01-03+14:46:31') select * from src limit 10 +POSTHOOK: query: insert into table src_orc_merge_test_part partition(ds='2012-01-03', ts='2012-01-03+14:46:31') select * from src order by key, value limit 10 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@src_orc_merge_test_part@ds=2012-01-03/ts=2012-01-03+14%3A46%3A31 @@ -82,7 +82,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@src_orc_merge_test_part POSTHOOK: Input: default@src_orc_merge_test_part@ds=2012-01-03/ts=2012-01-03+14%3A46%3A31 #### A masked pattern was here #### -159653 47778930280 +143807 50348357904 PREHOOK: query: alter table src_orc_merge_test_part partition (ds='2012-01-03', ts='2012-01-03+14:46:31') concatenate PREHOOK: type: ALTER_PARTITION_MERGE PREHOOK: Input: default@src_orc_merge_test_part @@ -112,7 +112,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@src_orc_merge_test_part POSTHOOK: Input: default@src_orc_merge_test_part@ds=2012-01-03/ts=2012-01-03+14%3A46%3A31 #### A masked pattern was here #### -159653 47778930280 +143807 50348357904 PREHOOK: query: drop table src_orc_merge_test_part PREHOOK: type: DROPTABLE PREHOOK: Input: default@src_orc_merge_test_part