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..aad8183 100644 --- a/ql/src/test/queries/clientpositive/auto_join0.q +++ b/ql/src/test/queries/clientpositive/auto_join0.q @@ -1,23 +1,25 @@ set hive.auto.convert.join = true; +-- SORT_QUERY_RESULTS explain 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; +-- SORT_QUERY_RESULTS 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..059f135 100644 --- a/ql/src/test/queries/clientpositive/auto_join1.q +++ b/ql/src/test/queries/clientpositive/auto_join1.q @@ -2,10 +2,12 @@ set hive.auto.convert.join =true; CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE; +-- SORT_QUERY_RESULTS explain -FROM src src1 JOIN src src2 ON (src1.key = src2.key) +FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value; +-- SORT_QUERY_RESULTS FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value; diff --git a/ql/src/test/queries/clientpositive/auto_join29.q b/ql/src/test/queries/clientpositive/auto_join29.q index c9eb9b0..7a840db 100644 --- a/ql/src/test/queries/clientpositive/auto_join29.q +++ b/ql/src/test/queries/clientpositive/auto_join29.q @@ -5,44 +5,61 @@ set hive.auto.convert.join = true; explain SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value; +-- SORT_QUERY_RESULTS SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value; +-- SORT_QUERY_RESULTS explain SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value; +-- SORT_QUERY_RESULTS SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value; +-- SORT_QUERY_RESULTS explain SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value; +-- SORT_QUERY_RESULTS SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value; +-- SORT_QUERY_RESULTS explain SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value; +-- SORT_QUERY_RESULTS SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value; +-- SORT_QUERY_RESULTS explain SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value; +-- SORT_QUERY_RESULTS SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value; +-- SORT_QUERY_RESULTS explain SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value; +-- SORT_QUERY_RESULTS SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value; +-- SORT_QUERY_RESULTS explain SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value; +-- SORT_QUERY_RESULTS SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value; +-- SORT_QUERY_RESULTS explain SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value; +-- SORT_QUERY_RESULTS SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value; +-- SORT_QUERY_RESULTS explain SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value; +-- SORT_QUERY_RESULTS SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value; diff --git a/ql/src/test/queries/clientpositive/cbo_gby.q b/ql/src/test/queries/clientpositive/cbo_gby.q index e0eed08..37dfc7c 100644 --- a/ql/src/test/queries/clientpositive/cbo_gby.q +++ b/ql/src/test/queries/clientpositive/cbo_gby.q @@ -5,16 +5,24 @@ set hive.stats.fetch.column.stats=true; set hive.auto.convert.join=false; -- 6. Test Select + TS + Join + Fil + GB + GB Having +-- SORT_QUERY_RESULTS select key, (c_int+1)+2 as x, sum(c_int) from cbo_t1 group by c_float, cbo_t1.c_int, key; + +--SORT_QUERY_RESULTS select x, y, count(*) from (select key, (c_int+c_float+1+2) as x, sum(c_int) as y from cbo_t1 group by c_float, cbo_t1.c_int, key) R group by y, x; +-- SORT_QUERY_RESULTS select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key order by a) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key order by q/10 desc, r asc) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c order by cbo_t3.c_int+c desc, c; +-- SORT_QUERY_RESULTS select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b % c asc, b desc) cbo_t1 left outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p left outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int % c asc, cbo_t3.c_int desc; +-- SORT_QUERY_RESULTS select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b+c, a desc) cbo_t1 right outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p right outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 2) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c; +-- SORT_QUERY_RESULTS select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by c+a desc) cbo_t1 full outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by p+q desc, r asc) cbo_t2 on cbo_t1.a=p full outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int; +-- SORT_QUERY_RESULTS select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c; diff --git a/ql/src/test/queries/clientpositive/cbo_udf_udaf.q b/ql/src/test/queries/clientpositive/cbo_udf_udaf.q index 093bcc9..b92e29b 100644 --- a/ql/src/test/queries/clientpositive/cbo_udf_udaf.q +++ b/ql/src/test/queries/clientpositive/cbo_udf_udaf.q @@ -11,6 +11,7 @@ select * from (select count(*) as a, count(distinct c_int) as b, sum(c_int) as c select * from (select count(*) as a, count(distinct c_int) as b, sum(c_int) as c, avg(c_int) as d, max(c_int) as e, min(c_int) as f, case c_int when 0 then 1 when 1 then 2 else 3 end as g, sum(case c_int when 0 then 1 when 1 then 2 else 3 end) as h from cbo_t1 group by c_int) cbo_t1 order by a; select f,a,e,b from (select count(*) as a, count(c_int) as b, sum(c_int) as c, avg(c_int) as d, max(c_int) as e, min(c_int) as f from cbo_t1) cbo_t1; select f,a,e,b from (select count(*) as a, count(distinct c_int) as b, sum(distinct c_int) as c, avg(distinct c_int) as d, max(distinct c_int) as e, min(distinct c_int) as f from cbo_t1) cbo_t1; +-- SORT_QUERY_RESULTS select key,count(c_int) as a, avg(c_float) from cbo_t1 group by key order by a; select count(distinct c_int) as a, avg(c_float) from cbo_t1 group by c_float order by a; select count(distinct c_int) as a, avg(c_float) from cbo_t1 group by c_int order by a; diff --git a/ql/src/test/queries/clientpositive/cbo_windowing.q b/ql/src/test/queries/clientpositive/cbo_windowing.q index fb4fe56..f16bf24 100644 --- a/ql/src/test/queries/clientpositive/cbo_windowing.q +++ b/ql/src/test/queries/clientpositive/cbo_windowing.q @@ -5,14 +5,24 @@ set hive.stats.fetch.column.stats=true; set hive.auto.convert.join=false; -- 9. Test Windowing Functions +-- SORT_QUERY_RESULTS select count(c_int) over() from cbo_t1; +-- SORT_QUERY_RESULTS select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1; +-- SORT_QUERY_RESULTS select * from (select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1) cbo_t1; +-- SORT_QUERY_RESULTS select x from (select count(c_int) over() as x, sum(c_float) over() from cbo_t1) cbo_t1; +-- SORT_QUERY_RESULTS select 1+sum(c_int) over() from cbo_t1; +-- SORT_QUERY_RESULTS select sum(c_int)+sum(sum(c_int)) over() from cbo_t1; +-- SORT_QUERY_RESULTS select * from (select max(c_int) over (partition by key order by value Rows UNBOUNDED PRECEDING), min(c_int) over (partition by key order by value rows current row), count(c_int) over(partition by key order by value ROWS 1 PRECEDING), avg(value) over (partition by key order by value Rows between unbounded preceding and unbounded following), sum(value) over (partition by key order by value rows between unbounded preceding and current row), avg(c_float) over (partition by key order by value Rows between 1 preceding and unbounded following), sum(c_float) over (partition by key order by value rows between 1 preceding and current row), max(c_float) over (partition by key order by value rows between 1 preceding and unbounded following), min(c_float) over (partition by key order by value rows between 1 preceding and 1 following) from cbo_t1) cbo_t1; +-- SORT_QUERY_RESULTS select i, a, h, b, c, d, e, f, g, a as x, a +1 as y from (select max(c_int) over (partition by key order by value range UNBOUNDED PRECEDING) a, min(c_int) over (partition by key order by value range current row) b, count(c_int) over(partition by key order by value range 1 PRECEDING) c, avg(value) over (partition by key order by value range between unbounded preceding and unbounded following) d, sum(value) over (partition by key order by value range between unbounded preceding and current row) e, avg(c_float) over (partition by key order by value range between 1 preceding and unbounded following) f, sum(c_float) over (partition by key order by value range between 1 preceding and current row) g, max(c_float) over (partition by key order by value range between 1 preceding and unbounded following) h, min(c_float) over (partition by key order by value range between 1 preceding and 1 following) i from cbo_t1) cbo_t1; +-- SORT_QUERY_RESULTS select *, rank() over(partition by key order by value) as rr from src1; +-- SORT_QUERY_RESULTS select *, rank() over(partition by key order by value) from src1; 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..69bce74 100644 --- a/ql/src/test/queries/clientpositive/cross_product_check_1.q +++ b/ql/src/test/queries/clientpositive/cross_product_check_1.q @@ -8,19 +8,24 @@ limit 10; set hive.auto.convert.join.noconditionaltask.size=100; +-- SORT_QUERY_RESULTS explain select * from A join B; +-- SORT_QUERY_RESULTS explain select * from B d1 join B d2 on d1.key = d2.key join A; +-- SORT_QUERY_RESULTS 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 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; +-- SORT_QUERY_RESULTS +explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1; + +-- SORT_QUERY_RESULTS explain select * from -(select A.key from A group by key) ss join +(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; 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..1e37da6 100644 --- a/ql/src/test/queries/clientpositive/cross_product_check_2.q +++ b/ql/src/test/queries/clientpositive/cross_product_check_2.q @@ -2,24 +2,29 @@ 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; set hive.auto.convert.join.noconditionaltask=true; set hive.auto.convert.join.noconditionaltask.size=10000000; +-- SORT_QUERY_RESULTS explain select * from A join B; +-- SORT_QUERY_RESULTS explain select * from B d1 join B d2 on d1.key = d2.key join A; +-- SORT_QUERY_RESULTS explain select * from A join (select d1.key from B d1 join B d2 on d1.key = d2.key where 1 = 1 group by d1.key) od1; - + +-- SORT_QUERY_RESULTS explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1; +-- SORT_QUERY_RESULTS 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; diff --git a/ql/src/test/queries/clientpositive/ctas.q b/ql/src/test/queries/clientpositive/ctas.q index b6de233..4c4d325 100644 --- a/ql/src/test/queries/clientpositive/ctas.q +++ b/ql/src/test/queries/clientpositive/ctas.q @@ -7,6 +7,7 @@ explain create table nzhang_CTAS1 as select key k, value from src sort by k, val create table nzhang_CTAS1 as select key k, value from src sort by k, value limit 10; +-- SORT_QUERY_RESULTS select * from nzhang_CTAS1; describe formatted nzhang_CTAS1; @@ -16,6 +17,7 @@ explain create table nzhang_ctas2 as select * from src sort by key, value limit create table nzhang_ctas2 as select * from src sort by key, value limit 10; +-- SORT_QUERY_RESULTS select * from nzhang_ctas2; describe formatted nzhang_CTAS2; @@ -25,6 +27,7 @@ explain create table nzhang_ctas3 row format serde "org.apache.hadoop.hive.serde create table nzhang_ctas3 row format serde "org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe" stored as RCFile as select key/2 half_key, concat(value, "_con") conb from src sort by half_key, conb limit 10; +-- SORT_QUERY_RESULTS select * from nzhang_ctas3; describe formatted nzhang_CTAS3; @@ -34,6 +37,7 @@ explain create table if not exists nzhang_ctas3 as select key, value from src so create table if not exists nzhang_ctas3 as select key, value from src sort by key, value limit 2; +-- SORT_QUERY_RESULTS select * from nzhang_ctas3; describe formatted nzhang_CTAS3; @@ -43,6 +47,7 @@ explain create table nzhang_ctas4 row format delimited fields terminated by ',' create table nzhang_ctas4 row format delimited fields terminated by ',' stored as textfile as select key, value from src sort by key, value limit 10; +-- SORT_QUERY_RESULTS select * from nzhang_ctas4; describe formatted nzhang_CTAS4; diff --git a/ql/src/test/queries/clientpositive/dynpart_sort_optimization2.q b/ql/src/test/queries/clientpositive/dynpart_sort_optimization2.q index 70c795d..35bd20c 100644 --- a/ql/src/test/queries/clientpositive/dynpart_sort_optimization2.q +++ b/ql/src/test/queries/clientpositive/dynpart_sort_optimization2.q @@ -25,6 +25,7 @@ partitioned by (ss_sold_date_sk int); load data local inpath '../../data/files/dynpart_test.txt' overwrite into table ss; +-- SORT_QUERY_RESULTS explain insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, @@ -36,6 +37,7 @@ select ss_net_paid_inc_tax, ss_net_profit distribute by ss_sold_date_sk; +-- SORT_QUERY_RESULTS insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, @@ -48,11 +50,14 @@ select ss_net_paid_inc_tax, distribute by ss_sold_date_sk; desc formatted ss_part partition(ss_sold_date_sk=2452617); +-- SORT_QUERY_RESULTS select * from ss_part where ss_sold_date_sk=2452617; desc formatted ss_part partition(ss_sold_date_sk=2452638); +-- SORT_QUERY_RESULTS select * from ss_part where ss_sold_date_sk=2452638; +-- SORT_QUERY_RESULTS explain insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, @@ -61,6 +66,7 @@ select ss_net_paid_inc_tax, where ss_sold_date_sk>=2452617 and ss_sold_date_sk<=2452638 distribute by ss_sold_date_sk; +-- SORT_QUERY_RESULTS insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, @@ -70,14 +76,17 @@ select ss_net_paid_inc_tax, distribute by ss_sold_date_sk; desc formatted ss_part partition(ss_sold_date_sk=2452617); +-- SORT_QUERY_RESULTS select * from ss_part where ss_sold_date_sk=2452617; desc formatted ss_part partition(ss_sold_date_sk=2452638); +-- SORT_QUERY_RESULTS select * from ss_part where ss_sold_date_sk=2452638; set hive.optimize.sort.dynamic.partition=false; -- SORT DYNAMIC PARTITION DISABLED +-- SORT_QUERY_RESULTS explain insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, @@ -89,6 +98,7 @@ select ss_net_paid_inc_tax, ss_net_profit distribute by ss_sold_date_sk; +-- SORT_QUERY_RESULTS insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, @@ -101,11 +111,14 @@ select ss_net_paid_inc_tax, distribute by ss_sold_date_sk; desc formatted ss_part partition(ss_sold_date_sk=2452617); +-- SORT_QUERY_RESULTS select * from ss_part where ss_sold_date_sk=2452617; desc formatted ss_part partition(ss_sold_date_sk=2452638); +-- SORT_QUERY_RESULTS select * from ss_part where ss_sold_date_sk=2452638; +-- SORT_QUERY_RESULTS explain insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, @@ -114,6 +127,7 @@ select ss_net_paid_inc_tax, where ss_sold_date_sk>=2452617 and ss_sold_date_sk<=2452638 distribute by ss_sold_date_sk; +-- SORT_QUERY_RESULTS insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, @@ -123,29 +137,35 @@ select ss_net_paid_inc_tax, distribute by ss_sold_date_sk; desc formatted ss_part partition(ss_sold_date_sk=2452617); +-- SORT_QUERY_RESULTS select * from ss_part where ss_sold_date_sk=2452617; desc formatted ss_part partition(ss_sold_date_sk=2452638); +-- SORT_QUERY_RESULTS select * from ss_part where ss_sold_date_sk=2452638; set hive.vectorized.execution.enabled=true; -- VECTORIZATION IS ENABLED +-- SORT_QUERY_RESULTS create table ss_orc ( ss_sold_date_sk int, ss_net_paid_inc_tax float, ss_net_profit float) stored as orc; +-- SORT_QUERY_RESULTS create table ss_part_orc ( ss_net_paid_inc_tax float, ss_net_profit float) partitioned by (ss_sold_date_sk int) stored as orc; +-- SORT_QUERY_RESULTS insert overwrite table ss_orc select * from ss; drop table ss; drop table ss_part; +-- SORT_QUERY_RESULTS explain insert overwrite table ss_part_orc partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, @@ -157,6 +177,7 @@ select ss_net_paid_inc_tax, ss_net_profit distribute by ss_sold_date_sk; +-- SORT_QUERY_RESULTS insert overwrite table ss_part_orc partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, @@ -169,11 +190,14 @@ select ss_net_paid_inc_tax, distribute by ss_sold_date_sk; desc formatted ss_part_orc partition(ss_sold_date_sk=2452617); +-- SORT_QUERY_RESULTS select * from ss_part_orc where ss_sold_date_sk=2452617; desc formatted ss_part_orc partition(ss_sold_date_sk=2452638); +-- SORT_QUERY_RESULTS select * from ss_part_orc where ss_sold_date_sk=2452638; +-- SORT_QUERY_RESULTS explain insert overwrite table ss_part_orc partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, @@ -182,6 +206,7 @@ select ss_net_paid_inc_tax, where ss_sold_date_sk>=2452617 and ss_sold_date_sk<=2452638 distribute by ss_sold_date_sk; +-- SORT_QUERY_RESULTS insert overwrite table ss_part_orc partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, @@ -191,15 +216,18 @@ select ss_net_paid_inc_tax, distribute by ss_sold_date_sk; desc formatted ss_part_orc partition(ss_sold_date_sk=2452617); +-- SORT_QUERY_RESULTS select * from ss_part_orc where ss_sold_date_sk=2452617; desc formatted ss_part_orc partition(ss_sold_date_sk=2452638); +-- SORT_QUERY_RESULTS select * from ss_part_orc where ss_sold_date_sk=2452638; drop table ss_orc; drop table ss_part_orc; drop table if exists hive13_dp1; +-- SORT_QUERY_RESULTS create table if not exists hive13_dp1 ( k1 int, k2 int @@ -208,6 +236,7 @@ PARTITIONED BY(`day` string) STORED AS ORC; set hive.optimize.sort.dynamic.partition=false; +-- SORT_QUERY_RESULTS explain insert overwrite table `hive13_dp1` partition(`day`) select key k1, @@ -216,6 +245,7 @@ select from src group by "day", key; +-- SORT_QUERY_RESULTS insert overwrite table `hive13_dp1` partition(`day`) select key k1, @@ -223,9 +253,11 @@ select "day" `day` from src group by "day", key; -select * from hive13_dp1 limit 5; +-- SORT_QUERY_RESULTS +select * from hive13_dp1 order by k1, k2 limit 5; set hive.optimize.sort.dynamic.partition=true; +-- SORT_QUERY_RESULTS explain insert overwrite table `hive13_dp1` partition(`day`) select key k1, @@ -234,6 +266,7 @@ select from src group by "day", key; +-- SORT_QUERY_RESULTS insert overwrite table `hive13_dp1` partition(`day`) select key k1, @@ -241,6 +274,8 @@ select "day" `day` from src group by "day", key; -select * from hive13_dp1 limit 5; + +-- SORT_QUERY_RESULTS +select * from hive13_dp1 order by k1, k2 limit 5; drop table hive13_dp1; diff --git a/ql/src/test/queries/clientpositive/explainuser_2.q b/ql/src/test/queries/clientpositive/explainuser_2.q index 8e8ac92..bd3c14f 100644 --- a/ql/src/test/queries/clientpositive/explainuser_2.q +++ b/ql/src/test/queries/clientpositive/explainuser_2.q @@ -1,25 +1,32 @@ set hive.explain.user=true; +-- SORT_QUERY_RESULTS CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE; +-- SORT_QUERY_RESULTS CREATE TABLE ss(k1 STRING,v1 STRING,k2 STRING,v2 STRING,k3 STRING,v3 STRING) STORED AS TEXTFILE; +-- SORT_QUERY_RESULTS CREATE TABLE sr(k1 STRING,v1 STRING,k2 STRING,v2 STRING,k3 STRING,v3 STRING) STORED AS TEXTFILE; +-- SORT_QUERY_RESULTS CREATE TABLE cs(k1 STRING,v1 STRING,k2 STRING,v2 STRING,k3 STRING,v3 STRING) STORED AS TEXTFILE; +-- SORT_QUERY_RESULTS INSERT OVERWRITE TABLE ss SELECT x.key,x.value,y.key,y.value,z.key,z.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=11); +-- SORT_QUERY_RESULTS INSERT OVERWRITE TABLE sr SELECT x.key,x.value,y.key,y.value,z.key,z.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=12); +-- SORT_QUERY_RESULTS INSERT OVERWRITE TABLE cs SELECT x.key,x.value,y.key,y.value,z.key,z.value FROM src1 x @@ -38,11 +45,13 @@ ANALYZE TABLE cs COMPUTE STATISTICS FOR COLUMNS k1,v1,k2,v2,k3,v3; set hive.auto.convert.join=false; +-- SORT_QUERY_RESULTS EXPLAIN SELECT x.key, z.value, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=11); +-- SORT_QUERY_RESULTS EXPLAIN select ss.k1,sr.k2,cs.k3,count(ss.v1),count(sr.v2),count(cs.v3) @@ -71,6 +80,7 @@ order by ss.k1,sr.k2,cs.k3 limit 100; +-- SORT_QUERY_RESULTS explain SELECT x.key, z.value, y.value FROM src1 x JOIN src y ON (x.key = y.key) @@ -80,7 +90,7 @@ SELECT x.key, z.value, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN (select * from src1 union select * from src)z ON (x.value = z.value); - +-- SORT_QUERY_RESULTS explain SELECT x.key, y.value FROM src1 x JOIN src y ON (x.key = y.key) @@ -99,12 +109,13 @@ set hive.auto.convert.join=true; set hive.auto.convert.join.noconditionaltask=true; set hive.auto.convert.join.noconditionaltask.size=10000; - +-- SORT_QUERY_RESULTS EXPLAIN SELECT x.key, z.value, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=11); +-- SORT_QUERY_RESULTS EXPLAIN select ss.k1,sr.k2,cs.k3,count(ss.v1),count(sr.v2),count(cs.v3) @@ -133,6 +144,7 @@ order by ss.k1,sr.k2,cs.k3 limit 100; +-- SORT_QUERY_RESULTS explain SELECT x.key, z.value, y.value FROM src1 x JOIN src y ON (x.key = y.key) @@ -142,7 +154,7 @@ SELECT x.key, z.value, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN (select * from src1 union select * from src)z ON (x.value = z.value); - +-- SORT_QUERY_RESULTS explain SELECT x.key, y.value FROM src1 x JOIN src y ON (x.key = y.key) @@ -178,13 +190,18 @@ set hive.enforce.bucketing=true; set hive.enforce.sorting = true; set hive.optimize.bucketingsorting=false; insert overwrite table tab_part partition (ds='2008-04-08') +-- SORT_QUERY_RESULTS select key,value from srcbucket_mapjoin_part; +-- SORT_QUERY_RESULTS CREATE TABLE tab(key int, value string) PARTITIONED BY(ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE; +-- SORT_QUERY_RESULTS insert overwrite table tab partition (ds='2008-04-08') select key,value from srcbucket_mapjoin; +-- SORT_QUERY_RESULTS CREATE TABLE tab2(key int, value string) PARTITIONED BY(ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE; +-- SORT_QUERY_RESULTS insert overwrite table tab2 partition (ds='2008-04-08') select key,value from srcbucket_mapjoin; @@ -193,32 +210,37 @@ set hive.auto.convert.sortmerge.join = true; set hive.auto.convert.join.noconditionaltask.size=500; - +-- SORT_QUERY_RESULTS explain select s1.key as key, s1.value as value from tab s1 join tab s3 on s1.key=s3.key; +-- SORT_QUERY_RESULTS explain select s1.key as key, s1.value as value from tab s1 join tab s3 on s1.key=s3.key join tab s2 on s1.value=s2.value; +-- SORT_QUERY_RESULTS explain select s1.key as key, s1.value as value from tab s1 join tab2 s3 on s1.key=s3.key; +-- SORT_QUERY_RESULTS explain select s1.key as key, s1.value as value from tab s1 join tab2 s3 on s1.key=s3.key join tab2 s2 on s1.value=s2.value; +-- SORT_QUERY_RESULTS explain select count(*) from (select s1.key as key, s1.value as value from tab s1 join tab s3 on s1.key=s3.key UNION ALL select s2.key as key, s2.value as value from tab s2 ) a join tab_part b on (a.key = b.key); - +-- SORT_QUERY_RESULTS explain select count(*) from (select s1.key as key, s1.value as value from tab s1 join tab s3 on s1.key=s3.key join tab s2 on s1.value=s2.value UNION ALL select s2.key as key, s2.value as value from tab s2 ) a join tab_part b on (a.key = b.key);set hive.explain.user=true; +-- SORT_QUERY_RESULTS explain SELECT x.key, y.value FROM src1 x JOIN src y ON (x.key = y.key) @@ -232,6 +254,7 @@ SELECT x.key, y.value FROM src1 x JOIN src1 y ON (x.key = y.key) JOIN (select key, value from src1 union all select key, value from src union all select key, value from src union all select key, value from src)z ON (x.value = z.value); +-- SORT_QUERY_RESULTS explain SELECT x.key, y.value FROM src1 x JOIN src y ON (x.key = y.key) @@ -249,6 +272,7 @@ CREATE TABLE a(key STRING, value STRING) STORED AS TEXTFILE; CREATE TABLE b(key STRING, value STRING) STORED AS TEXTFILE; CREATE TABLE c(key STRING, value STRING) STORED AS TEXTFILE; +-- SORT_QUERY_RESULTS explain from ( @@ -268,6 +292,7 @@ INSERT OVERWRITE TABLE a SELECT tmp.key, tmp.value INSERT OVERWRITE TABLE b SELECT tmp.key, tmp.value INSERT OVERWRITE TABLE c SELECT tmp.key, tmp.value; +-- SORT_QUERY_RESULTS explain FROM ( @@ -299,12 +324,14 @@ EXPLAIN FROM UNIQUEJOIN PRESERVE src a (a.key), PRESERVE src1 b (b.key), PRESERV set hive.entity.capture.transform=true; +-- SORT_QUERY_RESULTS EXPLAIN SELECT TRANSFORM(a.key, a.value) USING 'cat' AS (tkey, tvalue) FROM src a join src b on a.key = b.key; +-- SORT_QUERY_RESULTS explain FROM ( select key, value from ( @@ -318,6 +345,7 @@ INSERT OVERWRITE TABLE DEST1 SELECT unionsrc.key, COUNT(DISTINCT SUBSTR(unionsrc INSERT OVERWRITE TABLE DEST2 SELECT unionsrc.key, unionsrc.value, COUNT(DISTINCT SUBSTR(unionsrc.value,5)) GROUP BY unionsrc.key, unionsrc.value; +-- SORT_QUERY_RESULTS explain FROM ( select 'tst1' as key, cast(count(1) as string) as value, 'tst1' as value2 from src s1 diff --git a/ql/src/test/queries/clientpositive/filter_join_breaktask2.q b/ql/src/test/queries/clientpositive/filter_join_breaktask2.q index 4c99f77..d7853a4 100644 --- a/ql/src/test/queries/clientpositive/filter_join_breaktask2.q +++ b/ql/src/test/queries/clientpositive/filter_join_breaktask2.q @@ -1,26 +1,39 @@ +-- SORT_QUERY_RESULTS create table T1(c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string) partitioned by (ds string); +-- SORT_QUERY_RESULTS create table T2(c1 string, c2 string, c3 string, c0 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string) partitioned by (ds string); +-- SORT_QUERY_RESULTS create table T3 (c0 bigint, c1 bigint, c2 int) partitioned by (ds string); +-- SORT_QUERY_RESULTS create table T4 (c0 bigint, c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string, c26 string, c27 string, c28 string, c29 string, c30 string, c31 string, c32 string, c33 string, c34 string, c35 string, c36 string, c37 string, c38 string, c39 string, c40 string, c41 string, c42 string, c43 string, c44 string, c45 string, c46 string, c47 string, c48 string, c49 string, c50 string, c51 string, c52 string, c53 string, c54 string, c55 string, c56 string, c57 string, c58 string, c59 string, c60 string, c61 string, c62 string, c63 string, c64 string, c65 string, c66 string, c67 bigint, c68 string, c69 string, c70 bigint, c71 bigint, c72 bigint, c73 string, c74 string, c75 string, c76 string, c77 string, c78 string, c79 string, c80 string, c81 bigint, c82 bigint, c83 bigint) partitioned by (ds string); +-- SORT_QUERY_RESULTS insert overwrite table T1 partition (ds='2010-04-17') select '5', '1', '1', '1', 0, 0,4 from src tablesample (1 rows); +-- SORT_QUERY_RESULTS insert overwrite table T2 partition(ds='2010-04-17') select '5','name', NULL, '2', 'kavin',NULL, '9', 'c', '8', '0', '0', '7', '1','2', '0', '3','2', NULL, '1', NULL, '3','2','0','0','5','10' from src tablesample (1 rows); +-- SORT_QUERY_RESULTS insert overwrite table T3 partition (ds='2010-04-17') select 4,5,0 from src tablesample (1 rows); +-- SORT_QUERY_RESULTS insert overwrite table T4 partition(ds='2010-04-17') select 4,'1','1','8','4','5','1','0','9','U','2','2', '0','2','1','1','J','C','A','U', '2','s', '2',NULL, NULL, NULL,NULL, NULL, NULL,'1','j', 'S', '6',NULL,'1', '2', 'J', 'g', '1', 'e', '2', '1', '2', 'U', 'P', 'p', '3', '0', '0', '0', '1', '1', '1', '0', '0', '0', '6', '2', 'j',NULL, NULL, NULL,NULL,NULL, NULL, '5',NULL, 'j', 'j', 2, 2, 1, '2', '2', '1', '1', '1', '1', '1', '1', 1, 1, 32,NULL from src limit 1; +-- SORT_QUERY_RESULTS select * from T2; +-- SORT_QUERY_RESULTS select * from T1; +-- SORT_QUERY_RESULTS select * from T3; +-- SORT_QUERY_RESULTS select * from T4; +-- SORT_QUERY_RESULTS SELECT a.c1 as a_c1, b.c1 b_c1, d.c0 as d_c0 FROM T1 a JOIN T2 b ON (a.c1 = b.c1 AND a.ds='2010-04-17' AND b.ds='2010-04-17') diff --git a/ql/src/test/queries/clientpositive/insert_into1.q b/ql/src/test/queries/clientpositive/insert_into1.q index f19506a..e4bed81 100644 --- a/ql/src/test/queries/clientpositive/insert_into1.q +++ b/ql/src/test/queries/clientpositive/insert_into1.q @@ -3,16 +3,17 @@ 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; +-- SORT_QUERY_RESULTS +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 +22,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/insert_into2.q b/ql/src/test/queries/clientpositive/insert_into2.q index 1cbe391..a53f7f4 100644 --- a/ql/src/test/queries/clientpositive/insert_into2.q +++ b/ql/src/test/queries/clientpositive/insert_into2.q @@ -4,12 +4,12 @@ CREATE TABLE insert_into2 (key int, value string) PARTITIONED BY (ds string); EXPLAIN INSERT INTO TABLE insert_into2 PARTITION (ds='1') - SELECT * FROM src LIMIT 100; -INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src limit 100; + SELECT * FROM src order by key LIMIT 100; +INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src order by key limit 100; explain select count (*) from insert_into2 where ds = '1'; select count (*) from insert_into2 where ds = '1'; -INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src limit 100; +INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src order by key limit 100; explain SELECT COUNT(*) FROM insert_into2 WHERE ds='1'; SELECT COUNT(*) FROM insert_into2 WHERE ds='1'; @@ -18,9 +18,9 @@ SELECT SUM(HASH(c)) FROM ( ) t; EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 100; + SELECT * FROM src order by key LIMIT 100; INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 100; + SELECT * FROM src order by key LIMIT 100; SELECT SUM(HASH(c)) FROM ( SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM insert_into2 @@ -30,9 +30,9 @@ SELECT COUNT(*) FROM insert_into2 WHERE ds='2'; SELECT COUNT(*) FROM insert_into2 WHERE ds='2'; EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 50; + SELECT * FROM src order by key LIMIT 50; INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 50; + SELECT * FROM src order by key LIMIT 50; SELECT SUM(HASH(c)) FROM ( SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM insert_into2 ) t; diff --git a/ql/src/test/queries/clientpositive/join1.q b/ql/src/test/queries/clientpositive/join1.q index a388683..bb44157 100644 --- a/ql/src/test/queries/clientpositive/join1.q +++ b/ql/src/test/queries/clientpositive/join1.q @@ -4,11 +4,14 @@ set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE; +-- SORT_QUERY_RESULTS EXPLAIN FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value; +-- SORT_QUERY_RESULTS FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value; +-- SORT_QUERY_RESULTS SELECT dest_j1.* FROM dest_j1; diff --git a/ql/src/test/queries/clientpositive/join_nullsafe.q b/ql/src/test/queries/clientpositive/join_nullsafe.q index 78a65d6..5b79a0b 100644 --- a/ql/src/test/queries/clientpositive/join_nullsafe.q +++ b/ql/src/test/queries/clientpositive/join_nullsafe.q @@ -4,28 +4,44 @@ CREATE TABLE myinput1(key int, value int); LOAD DATA LOCAL INPATH '../../data/files/in8.txt' INTO TABLE myinput1; -- merging +-- SORT_QUERY_RESULTS explain select * from myinput1 a join myinput1 b on a.key<=>b.value; +-- SORT_QUERY_RESULTS select * from myinput1 a join myinput1 b on a.key<=>b.value; +-- SORT_QUERY_RESULTS explain select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key=c.key; +-- SORT_QUERY_RESULTS select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key=c.key; +-- SORT_QUERY_RESULTS explain select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key<=>c.key; +-- SORT_QUERY_RESULTS select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key<=>c.key; +-- SORT_QUERY_RESULTS explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value=b.key join myinput1 c on a.key<=>c.key AND a.value=c.value; + +-- SORT_QUERY_RESULTS select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value=b.key join myinput1 c on a.key<=>c.key AND a.value=c.value; +-- SORT_QUERY_RESULTS explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value<=>b.key join myinput1 c on a.key<=>c.key AND a.value<=>c.value; +-- SORT_QUERY_RESULTS select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value<=>b.key join myinput1 c on a.key<=>c.key AND a.value<=>c.value; -- outer joins +-- SORT_QUERY_RESULTS SELECT * FROM myinput1 a LEFT OUTER JOIN myinput1 b ON a.key<=>b.value; +-- SORT_QUERY_RESULTS SELECT * FROM myinput1 a RIGHT OUTER JOIN myinput1 b ON a.key<=>b.value; +-- SORT_QUERY_RESULTS SELECT * FROM myinput1 a FULL OUTER JOIN myinput1 b ON a.key<=>b.value; -- map joins +-- SORT_QUERY_RESULTS SELECT /*+ MAPJOIN(a) */ * FROM myinput1 a JOIN myinput1 b ON a.key<=>b.value; +-- SORT_QUERY_RESULTS SELECT /*+ MAPJOIN(b) */ * FROM myinput1 a JOIN myinput1 b ON a.key<=>b.value; CREATE TABLE smb_input(key int, value int); @@ -47,22 +63,37 @@ SET hive.optimize.bucketmapjoin = true; SET hive.optimize.bucketmapjoin.sortedmerge = true; SET hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat; +-- SORT_QUERY_RESULTS SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key; +-- SORT_QUERY_RESULTS SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key AND a.value <=> b.value; +-- SORT_QUERY_RESULTS SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a RIGHT OUTER JOIN smb_input1 b ON a.key <=> b.key; +-- SORT_QUERY_RESULTS SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key; +-- SORT_QUERY_RESULTS SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a LEFT OUTER JOIN smb_input1 b ON a.key <=> b.key; +-- SORT_QUERY_RESULTS SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input2 b ON a.key <=> b.value; +-- SORT_QUERY_RESULTS SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a JOIN smb_input2 b ON a.key <=> b.value; +-- SORT_QUERY_RESULTS SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a LEFT OUTER JOIN smb_input2 b ON a.key <=> b.value; +-- SORT_QUERY_RESULTS SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a RIGHT OUTER JOIN smb_input2 b ON a.key <=> b.value; +-- SORT_QUERY_RESULTS SELECT /*+ MAPJOIN(a) */ * FROM smb_input2 a JOIN smb_input2 b ON a.value <=> b.value; +-- SORT_QUERY_RESULTS SELECT /*+ MAPJOIN(a) */ * FROM smb_input2 a RIGHT OUTER JOIN smb_input2 b ON a.value <=> b.value; +-- SORT_QUERY_RESULTS SELECT /*+ MAPJOIN(b) */ * FROM smb_input2 a JOIN smb_input2 b ON a.value <=> b.value; +-- SORT_QUERY_RESULTS SELECT /*+ MAPJOIN(b) */ * FROM smb_input2 a LEFT OUTER JOIN smb_input2 b ON a.value <=> b.value; --HIVE-3315 join predicate transitive +-- SORT_QUERY_RESULTS explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.key is NULL; +-- SORT_QUERY_RESULTS select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.key is NULL; diff --git a/ql/src/test/queries/clientpositive/lvj_mapjoin.q b/ql/src/test/queries/clientpositive/lvj_mapjoin.q index 4a391b4..9d16c5b 100644 --- a/ql/src/test/queries/clientpositive/lvj_mapjoin.q +++ b/ql/src/test/queries/clientpositive/lvj_mapjoin.q @@ -16,9 +16,12 @@ load data local inpath '../../data/files//sour2.txt' into table sour2; create table expod1(aid int, av array); create table expod2(bid int, bv array); +-- SORT_QUERY_RESULTS insert overwrite table expod1 select id, array(av1,av2,av3) from sour1; +-- SORT_QUERY_RESULTS insert overwrite table expod2 select id, array(bv1,bv2,bv3) from sour2; +-- SORT_QUERY_RESULTS explain with sub1 as (select aid, avalue from expod1 lateral view explode(av) avs as avalue ), sub2 as @@ -27,6 +30,7 @@ select sub1.aid, sub1.avalue, sub2.bvalue from sub1,sub2 where sub1.aid=sub2.bid; +-- SORT_QUERY_RESULTS with sub1 as (select aid, avalue from expod1 lateral view explode(av) avs as avalue ), sub2 as 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/mapjoin_mapjoin.q b/ql/src/test/queries/clientpositive/mapjoin_mapjoin.q index 5bf4ab1..b580abe 100644 --- a/ql/src/test/queries/clientpositive/mapjoin_mapjoin.q +++ b/ql/src/test/queries/clientpositive/mapjoin_mapjoin.q @@ -8,20 +8,26 @@ set hive.auto.convert.join.noconditionaltask.size=10000; explain extended select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key); +-- SORT_QUERY_RESULTS explain select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450'; +-- SORT_QUERY_RESULTS explain select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds; set hive.mapjoin.optimized.hashtable=false; +-- SORT_QUERY_RESULTS select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450'; +-- SORT_QUERY_RESULTS select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds; set hive.mapjoin.optimized.hashtable=true; +-- SORT_QUERY_RESULTS select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450'; +-- SORT_QUERY_RESULTS select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds; diff --git a/ql/src/test/queries/clientpositive/mergejoin.q b/ql/src/test/queries/clientpositive/mergejoin.q index 257337a..e11ccc5 100644 --- a/ql/src/test/queries/clientpositive/mergejoin.q +++ b/ql/src/test/queries/clientpositive/mergejoin.q @@ -6,9 +6,11 @@ set hive.optimize.metadataonly=false; set hive.optimize.index.filter=true; set hive.vectorized.execution.enabled=true; +-- SORT_QUERY_RESULTS explain select * from src a join src1 b on a.key = b.key; +-- SORT_QUERY_RESULTS select * from src a join src1 b on a.key = b.key; CREATE TABLE srcbucket_mapjoin(key int, value string) partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE; @@ -33,14 +35,17 @@ CREATE TABLE tab(key int, value string) PARTITIONED BY(ds STRING) CLUSTERED BY ( insert overwrite table tab partition (ds='2008-04-08') select key,value from srcbucket_mapjoin; +-- SORT_QUERY_RESULTS explain select count(*) from tab a join tab_part b on a.key = b.key; +-- SORT_QUERY_RESULTS select * from tab a join tab_part b on a.key = b.key; set hive.join.emit.interval=2; +-- SORT_QUERY_RESULTS select * from tab a join tab_part b on a.key = b.key; explain diff --git a/ql/src/test/queries/clientpositive/mrr.q b/ql/src/test/queries/clientpositive/mrr.q index a3007ff..79f4259 100644 --- a/ql/src/test/queries/clientpositive/mrr.q +++ b/ql/src/test/queries/clientpositive/mrr.q @@ -1,19 +1,26 @@ -- simple query with multiple reduce stages +-- SORT_QUERY_RESULTS EXPLAIN SELECT key, count(value) as cnt FROM src GROUP BY key ORDER BY cnt; +-- SORT_QUERY_RESULTS SELECT key, count(value) as cnt FROM src GROUP BY key ORDER BY cnt; set hive.auto.convert.join=false; -- join query with multiple reduce stages; +-- SORT_QUERY_RESULTS EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt; +-- SORT_QUERY_RESULTS SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt; set hive.auto.convert.join=true; -- same query with broadcast join +-- SORT_QUERY_RESULTS EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt; +-- SORT_QUERY_RESULTS SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt; set hive.auto.convert.join=false; -- query with multiple branches in the task dag +-- SORT_QUERY_RESULTS EXPLAIN SELECT * FROM @@ -30,6 +37,7 @@ WHERE s1.cnt > 1 ORDER BY s1.key; +-- SORT_QUERY_RESULTS SELECT * FROM (SELECT key, count(value) as cnt @@ -47,12 +55,14 @@ ORDER BY s1.key; set hive.auto.convert.join=true; -- query with broadcast join in the reduce stage +-- SORT_QUERY_RESULTS EXPLAIN SELECT * FROM (SELECT key, count(value) as cnt FROM src GROUP BY key) s1 JOIN src ON (s1.key = src.key) order by s1.key; +-- SORT_QUERY_RESULTS SELECT * FROM (SELECT key, count(value) as cnt FROM src GROUP BY key) s1 diff --git a/ql/src/test/queries/clientpositive/orc_merge1.q b/ql/src/test/queries/clientpositive/orc_merge1.q index 410ef0b..0b6ff50 100644 --- a/ql/src/test/queries/clientpositive/orc_merge1.q +++ b/ql/src/test/queries/clientpositive/orc_merge1.q @@ -42,6 +42,7 @@ EXPLAIN SELECT key, value, PMOD(HASH(key), 2) as part FROM src; +-- SORT_QUERY_RESULTS INSERT OVERWRITE TABLE orcfile_merge1b PARTITION (ds='1', part) SELECT key, value, PMOD(HASH(key), 2) as part FROM src; @@ -55,6 +56,7 @@ EXPLAIN SELECT key, value, PMOD(HASH(key), 2) as part FROM src; +-- SORT_QUERY_RESULTS INSERT OVERWRITE TABLE orcfile_merge1c PARTITION (ds='1', part) SELECT key, value, PMOD(HASH(key), 2) as part FROM src; @@ -63,16 +65,19 @@ dfs -ls ${hiveconf:hive.metastore.warehouse.dir}/orcfile_merge1c/ds=1/part=0/; set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; -- Verify +-- SORT_QUERY_RESULTS SELECT SUM(HASH(c)) FROM ( SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM orcfile_merge1 WHERE ds='1' ) t; +-- SORT_QUERY_RESULTS SELECT SUM(HASH(c)) FROM ( SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM orcfile_merge1b WHERE ds='1' ) t; +-- SORT_QUERY_RESULTS SELECT SUM(HASH(c)) FROM ( SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM orcfile_merge1c WHERE ds='1' diff --git a/ql/src/test/queries/clientpositive/script_env_var1.q b/ql/src/test/queries/clientpositive/script_env_var1.q index 0148905..77d9945 100644 --- a/ql/src/test/queries/clientpositive/script_env_var1.q +++ b/ql/src/test/queries/clientpositive/script_env_var1.q @@ -1,5 +1,5 @@ -- Verifies that script operator ID environment variables have unique values -- in each instance of the script operator. SELECT count(1) FROM -( SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' AS key FROM src LIMIT 1)x UNION ALL - SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' AS key FROM src LIMIT 1)y ) a GROUP BY key; +( SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' AS key FROM src order by key LIMIT 1)x UNION ALL + SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' AS key FROM src order by key LIMIT 1)y ) a GROUP BY key; diff --git a/ql/src/test/queries/clientpositive/selectDistinctStar.q b/ql/src/test/queries/clientpositive/selectDistinctStar.q index e06f167..b121baa 100644 --- a/ql/src/test/queries/clientpositive/selectDistinctStar.q +++ b/ql/src/test/queries/clientpositive/selectDistinctStar.q @@ -1,21 +1,29 @@ +-- SORT_QUERY_RESULTS explain select distinct src.* from src; +-- SORT_QUERY_RESULTS select distinct src.* from src; +-- SORT_QUERY_RESULTS select distinct * from src; +-- SORT_QUERY_RESULTS explain select distinct * from src where key < '3'; +-- SORT_QUERY_RESULTS select distinct * from src where key < '3'; +-- SORT_QUERY_RESULTS from src a select distinct a.* where a.key = '238'; +-- SORT_QUERY_RESULTS explain SELECT distinct * from ( select * from src1 union all select * from src )subq; +-- SORT_QUERY_RESULTS SELECT distinct * from ( select * from src1 union all @@ -23,51 +31,67 @@ select * from src )subq; drop view if exists sdi; +-- SORT_QUERY_RESULTS explain create view sdi as select distinct * from src order by key limit 2; +-- SORT_QUERY_RESULTS create view sdi as select distinct * from src order by key limit 2; describe extended sdi; describe formatted sdi; +-- SORT_QUERY_RESULTS select * from sdi; +-- SORT_QUERY_RESULTS select distinct * from src union all select distinct * from src1; +-- SORT_QUERY_RESULTS select distinct * from src join src1 on src.key=src1.key; +-- SORT_QUERY_RESULTS SELECT distinct * FROM src1 x JOIN src y ON (x.key = y.key) JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=11); +-- SORT_QUERY_RESULTS select * from (select distinct * from src)src1 join (select distinct * from src)src2 on src1.key=src2.key; +-- SORT_QUERY_RESULTS select distinct * from (select distinct * from src)src1; set hive.cbo.enable=false; +-- SORT_QUERY_RESULTS explain select distinct src.* from src; +-- SORT_QUERY_RESULTS select distinct src.* from src; +-- SORT_QUERY_RESULTS select distinct * from src; +-- SORT_QUERY_RESULTS explain select distinct * from src where key < '3'; +-- SORT_QUERY_RESULTS select distinct * from src where key < '3'; +-- SORT_QUERY_RESULTS from src a select distinct a.* where a.key = '238'; +-- SORT_QUERY_RESULTS explain SELECT distinct * from ( select * from src1 union all select * from src )subq; +-- SORT_QUERY_RESULTS SELECT distinct * from ( select * from src1 union all @@ -75,6 +99,7 @@ select * from src )subq; drop view if exists sdi; +-- SORT_QUERY_RESULTS explain create view sdi as select distinct * from src order by key limit 2; create view sdi as select distinct * from src order by key limit 2; @@ -83,19 +108,25 @@ describe extended sdi; describe formatted sdi; +-- SORT_QUERY_RESULTS select * from sdi; +-- SORT_QUERY_RESULTS select distinct * from src union all select distinct * from src1; +-- SORT_QUERY_RESULTS select distinct * from src join src1 on src.key=src1.key; +-- SORT_QUERY_RESULTS SELECT distinct * FROM src1 x JOIN src y ON (x.key = y.key) JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=11); +-- SORT_QUERY_RESULTS select * from (select distinct * from src)src1 join (select distinct * from src)src2 on src1.key=src2.key; +-- SORT_QUERY_RESULTS select distinct * from (select distinct * from src)src1; diff --git a/ql/src/test/queries/clientpositive/skewjoin.q b/ql/src/test/queries/clientpositive/skewjoin.q index 47535ea..2fc5112 100644 --- a/ql/src/test/queries/clientpositive/skewjoin.q +++ b/ql/src/test/queries/clientpositive/skewjoin.q @@ -1,12 +1,6 @@ set hive.optimize.skewjoin = true; set hive.skewjoin.key = 2; - - - - - - CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE; CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE; CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE; @@ -18,43 +12,49 @@ LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE T2; LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3; LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T4; - +-- SORT_QUERY_RESULTS EXPLAIN FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value; +-- SORT_QUERY_RESULTS FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value; SELECT sum(hash(key)), sum(hash(value)) FROM dest_j1; - +-- SORT_QUERY_RESULTS EXPLAIN SELECT /*+ STREAMTABLE(a) */ * FROM T1 a JOIN T2 b ON a.key = b.key JOIN T3 c ON b.key = c.key JOIN T4 d ON c.key = d.key; +-- SORT_QUERY_RESULTS SELECT /*+ STREAMTABLE(a) */ * FROM T1 a JOIN T2 b ON a.key = b.key JOIN T3 c ON b.key = c.key JOIN T4 d ON c.key = d.key; +-- SORT_QUERY_RESULTS EXPLAIN SELECT /*+ STREAMTABLE(a,c) */ * FROM T1 a JOIN T2 b ON a.key = b.key JOIN T3 c ON b.key = c.key JOIN T4 d ON c.key = d.key; +-- SORT_QUERY_RESULTS SELECT /*+ STREAMTABLE(a,c) */ * FROM T1 a JOIN T2 b ON a.key = b.key JOIN T3 c ON b.key = c.key JOIN T4 d ON c.key = d.key; - +-- SORT_QUERY_RESULTS EXPLAIN FROM T1 a JOIN src c ON c.key+1=a.key SELECT /*+ STREAMTABLE(a) */ sum(hash(a.key)), sum(hash(a.val)), sum(hash(c.key)); +-- SORT_QUERY_RESULTS FROM T1 a JOIN src c ON c.key+1=a.key SELECT /*+ STREAMTABLE(a) */ sum(hash(a.key)), sum(hash(a.val)), sum(hash(c.key)); +-- SORT_QUERY_RESULTS EXPLAIN FROM (SELECT src.* FROM src) x JOIN @@ -62,6 +62,7 @@ JOIN ON (x.key = Y.key) SELECT sum(hash(Y.key)), sum(hash(Y.value)); +-- SORT_QUERY_RESULTS FROM (SELECT src.* FROM src) x JOIN @@ -69,7 +70,7 @@ JOIN ON (x.key = Y.key) SELECT sum(hash(Y.key)), sum(hash(Y.value)); - +-- SORT_QUERY_RESULTS EXPLAIN FROM (SELECT src.* FROM src) x JOIN @@ -77,6 +78,7 @@ JOIN ON (x.key = Y.key and substring(x.value, 5)=substring(y.value, 5)+1) SELECT sum(hash(Y.key)), sum(hash(Y.value)); +-- SORT_QUERY_RESULTS FROM (SELECT src.* FROM src) x JOIN @@ -84,7 +86,6 @@ JOIN ON (x.key = Y.key and substring(x.value, 5)=substring(y.value, 5)+1) SELECT sum(hash(Y.key)), sum(hash(Y.value)); - EXPLAIN SELECT sum(hash(src1.c1)), sum(hash(src2.c4)) FROM diff --git a/ql/src/test/queries/clientpositive/subquery_exists.q b/ql/src/test/queries/clientpositive/subquery_exists.q index b16584e..03e1616 100644 --- a/ql/src/test/queries/clientpositive/subquery_exists.q +++ b/ql/src/test/queries/clientpositive/subquery_exists.q @@ -1,6 +1,7 @@ -- SORT_QUERY_RESULTS -- no agg, corr +-- SORT_QUERY_RESULTS explain select * from src b @@ -11,6 +12,7 @@ where exists ) ; +-- SORT_QUERY_RESULTS select * from src b where exists @@ -21,6 +23,7 @@ where exists ; -- view test +-- SORT_QUERY_RESULTS create view cv1 as select * from src b @@ -30,10 +33,12 @@ where exists where b.value = a.value and a.key = b.key and a.value > 'val_9') ; +-- SORT_QUERY_RESULTS select * from cv1 ; -- sq in from +-- SORT_QUERY_RESULTS select * from (select * from src b diff --git a/ql/src/test/queries/clientpositive/temp_table.q b/ql/src/test/queries/clientpositive/temp_table.q index 9667070..ac0acb1 100644 --- a/ql/src/test/queries/clientpositive/temp_table.q +++ b/ql/src/test/queries/clientpositive/temp_table.q @@ -7,8 +7,8 @@ CREATE TEMPORARY TABLE bar AS SELECT * FROM src WHERE key % 2 = 1; DESCRIBE foo; DESCRIBE bar; -explain select * from foo limit 10; -select * from foo limit 10; +explain select * from foo order by key limit 10; +select * from foo order by key limit 10; explain select * from (select * from foo union all select * from bar) u order by key limit 10; select * from (select * from foo union all select * from bar) u order by key limit 10; @@ -22,7 +22,7 @@ select * from bay; INSERT OVERWRITE TABLE bay SELECT * FROM src ORDER BY key; -select * from bay limit 10; +select * from bay order by key limit 10; SHOW TABLES; diff --git a/ql/src/test/queries/clientpositive/tez_dml.q b/ql/src/test/queries/clientpositive/tez_dml.q index 87d251f..d5b3968 100644 --- a/ql/src/test/queries/clientpositive/tez_dml.q +++ b/ql/src/test/queries/clientpositive/tez_dml.q @@ -2,35 +2,49 @@ set hive.exec.dynamic.partition.mode=nonstrict; -- CTAS EXPLAIN CREATE TABLE tmp_src AS SELECT * FROM (SELECT value, count(value) AS cnt FROM src GROUP BY value) f1 ORDER BY cnt; +-- SORT_QUERY_RESULTS CREATE TABLE tmp_src AS SELECT * FROM (SELECT value, count(value) AS cnt FROM src GROUP BY value) f1 ORDER BY cnt; +-- SORT_QUERY_RESULTS SELECT * FROM tmp_src; -- dyn partitions +-- SORT_QUERY_RESULTS CREATE TABLE tmp_src_part (c string) PARTITIONED BY (d int); +-- SORT_QUERY_RESULTS EXPLAIN INSERT INTO TABLE tmp_src_part PARTITION (d) SELECT * FROM tmp_src; +-- SORT_QUERY_RESULTS INSERT INTO TABLE tmp_src_part PARTITION (d) SELECT * FROM tmp_src; +-- SORT_QUERY_RESULTS SELECT * FROM tmp_src_part; -- multi insert +-- SORT_QUERY_RESULTS CREATE TABLE even (c int, d string); +-- SORT_QUERY_RESULTS CREATE TABLE odd (c int, d string); +-- SORT_QUERY_RESULTS EXPLAIN FROM src INSERT INTO TABLE even SELECT key, value WHERE key % 2 = 0 INSERT INTO TABLE odd SELECT key, value WHERE key % 2 = 1; +-- SORT_QUERY_RESULTS FROM src INSERT INTO TABLE even SELECT key, value WHERE key % 2 = 0 INSERT INTO TABLE odd SELECT key, value WHERE key % 2 = 1; +-- SORT_QUERY_RESULTS SELECT * FROM even; +-- SORT_QUERY_RESULTS SELECT * FROM odd; -- create empty table +-- SORT_QUERY_RESULTS CREATE TABLE empty STORED AS orc AS SELECT * FROM tmp_src_part WHERE d = -1000; +-- SORT_QUERY_RESULTS SELECT * FROM empty; -- drop the tables diff --git a/ql/src/test/queries/clientpositive/tez_join_hash.q b/ql/src/test/queries/clientpositive/tez_join_hash.q index 67d89f8..04b14e3 100644 --- a/ql/src/test/queries/clientpositive/tez_join_hash.q +++ b/ql/src/test/queries/clientpositive/tez_join_hash.q @@ -23,12 +23,14 @@ srcpart x join srcpart y on (x.key = y.key) union all select key, value from srcpart z) a join src b on (a.value = b.value) group by a.key, a.value; +-- SORT_QUERY_RESULTS select key, count(*) from (select x.key as key, y.value as value from srcpart x join srcpart y on (x.key = y.key) union all select key, value from srcpart z) a join src b on (a.value = b.value) group by a.key, a.value; set hive.execution.engine=mr; +-- SORT_QUERY_RESULTS select key, count(*) from (select x.key as key, y.value as value from srcpart x join srcpart y on (x.key = y.key) union all diff --git a/ql/src/test/queries/clientpositive/tez_join_tests.q b/ql/src/test/queries/clientpositive/tez_join_tests.q index 8b65049..ca3af6b 100644 --- a/ql/src/test/queries/clientpositive/tez_join_tests.q +++ b/ql/src/test/queries/clientpositive/tez_join_tests.q @@ -7,7 +7,9 @@ select * from (select b.key, b.value from src1 a left outer join src b on (a.key select * from (select b.key, b.value from src1 a left outer join src b on (a.key = b.key)) x right outer join src c on (x.value = c.value) order by x.key; select * from src1 a left outer join src b on (a.key = b.key) right outer join src c on (a.value = c.value) order by a.key; select * from src1 a left outer join src b on (a.key = b.key) left outer join src c on (a.value = c.value) order by a.key; +-- SORT_QUERY_RESULTS select * from src1 a left outer join src b on (a.key = b.key) join src c on (a.key = c.key); +-- SORT_QUERY_RESULTS select * from src1 a join src b on (a.key = b.key) join src c on (a.key = c.key); select count(*) from src1 a join src b on (a.key = b.key) join src c on (a.key = c.key); diff --git a/ql/src/test/queries/clientpositive/tez_joins_explain.q b/ql/src/test/queries/clientpositive/tez_joins_explain.q index 7d3b8f6..3154018 100644 --- a/ql/src/test/queries/clientpositive/tez_joins_explain.q +++ b/ql/src/test/queries/clientpositive/tez_joins_explain.q @@ -1,7 +1,7 @@ -- SORT_QUERY_RESULTS - explain select * from (select b.key, b.value from src1 a left outer join src b on (a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) order by x.key; +-- SORT_QUERY_RESULTS select * from (select b.key, b.value from src1 a left outer join src b on (a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) order by x.key; diff --git a/ql/src/test/queries/clientpositive/tez_multi_union.q b/ql/src/test/queries/clientpositive/tez_multi_union.q index 28fdfea..9dd3c8d 100644 --- a/ql/src/test/queries/clientpositive/tez_multi_union.q +++ b/ql/src/test/queries/clientpositive/tez_multi_union.q @@ -1,3 +1,4 @@ +-- SORT_QUERY_RESULTS select key from ( select key from src diff --git a/ql/src/test/queries/clientpositive/tez_schema_evolution.q b/ql/src/test/queries/clientpositive/tez_schema_evolution.q index 2f1c73f..cd4749a 100644 --- a/ql/src/test/queries/clientpositive/tez_schema_evolution.q +++ b/ql/src/test/queries/clientpositive/tez_schema_evolution.q @@ -1,14 +1,17 @@ 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; +-- SORT_QUERY_RESULTS +select * from test where p=1 and key > 0 order by key; +-- SORT_QUERY_RESULTS +select * from test where p=2 and key > 0 order by key; +-- SORT_QUERY_RESULTS +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_mapjoin.q b/ql/src/test/queries/clientpositive/vectorized_mapjoin.q index e5e15ab..a76c028 100644 --- a/ql/src/test/queries/clientpositive/vectorized_mapjoin.q +++ b/ql/src/test/queries/clientpositive/vectorized_mapjoin.q @@ -3,10 +3,12 @@ SET hive.auto.convert.join=true; SET hive.auto.convert.join.noconditionaltask=true; SET hive.auto.convert.join.noconditionaltask.size=1000000000; +-- SORT_QUERY_RESULTS EXPLAIN SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) FROM alltypesorc t1 JOIN alltypesorc t2 ON t1.cint = t2.cint; +-- SORT_QUERY_RESULTS SELECT COUNT(t1.cint), MAX(t2.cint), 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 diff --git a/ql/src/test/queries/clientpositive/vectorized_nested_mapjoin.q b/ql/src/test/queries/clientpositive/vectorized_nested_mapjoin.q index e7e4b33..75fe156 100644 --- a/ql/src/test/queries/clientpositive/vectorized_nested_mapjoin.q +++ b/ql/src/test/queries/clientpositive/vectorized_nested_mapjoin.q @@ -3,6 +3,8 @@ SET hive.auto.convert.join=true; SET hive.auto.convert.join.noconditionaltask=true; SET hive.auto.convert.join.noconditionaltask.size=1000000000; +-- SORT_QUERY_RESULTS explain select sum(t1.td) from (select v1.csmallint as tsi, v1.cdouble as td from alltypesorc v1, alltypesorc v2 where v1.ctinyint=v2.ctinyint) t1 join alltypesorc v3 on t1.tsi=v3.csmallint; +-- SORT_QUERY_RESULTS select sum(t1.td) from (select v1.csmallint as tsi, v1.cdouble as td from alltypesorc v1, alltypesorc v2 where v1.ctinyint=v2.ctinyint) t1 join alltypesorc v3 on t1.tsi=v3.csmallint; 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/alter_merge_2_orc.q.out b/ql/src/test/results/clientpositive/alter_merge_2_orc.q.out index 1ccae8e..7e30942 100644 --- a/ql/src/test/results/clientpositive/alter_merge_2_orc.q.out +++ b/ql/src/test/results/clientpositive/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 diff --git a/ql/src/test/results/clientpositive/auto_join0.q.out b/ql/src/test/results/clientpositive/auto_join0.q.out index b0118ce..e027c12 100644 --- a/ql/src/test/results/clientpositive/auto_join0.q.out +++ b/ql/src/test/results/clientpositive/auto_join0.q.out @@ -1,41 +1,47 @@ -Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Stage-2:MAPRED' is a cross product -PREHOOK: query: explain +Warning: Map Join MAPJOIN[45][bigTable=?] in task 'Stage-7:MAPRED' is a cross product +Warning: Map Join MAPJOIN[38][bigTable=?] in task 'Stage-6:MAPRED' is a cross product +Warning: Shuffle Join JOIN[12][tables = [src1, src2]] in Stage 'Stage-2:MAPRED' is a cross product +PREHOOK: query: -- SORT_QUERY_RESULTS +explain 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 PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain 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 POSTHOOK: type: QUERY STAGE DEPENDENCIES: - Stage-6 is a root stage - Stage-2 depends on stages: Stage-6 - Stage-3 depends on stages: Stage-2 - Stage-0 depends on stages: Stage-3 + Stage-1 is a root stage + Stage-8 depends on stages: Stage-1, Stage-5 , consists of Stage-9, Stage-10, Stage-2 + Stage-9 has a backup stage: Stage-2 + Stage-6 depends on stages: Stage-9 + Stage-3 depends on stages: Stage-2, Stage-6, Stage-7 + Stage-4 depends on stages: Stage-3 + Stage-10 has a backup stage: Stage-2 + Stage-7 depends on stages: Stage-10 + Stage-2 + Stage-5 is a root stage + Stage-0 depends on stages: Stage-4 STAGE PLANS: - Stage: Stage-6 - Map Reduce Local Work - Alias -> Map Local Tables: - a:src1:src - Fetch Operator - limit: -1 - Alias -> Map Local Operator Tree: - a:src1:src + Stage: Stage-1 + Map Reduce + Map Operator Tree: TableScan alias: src Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE @@ -46,38 +52,67 @@ STAGE PLANS: expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE - HashTable Sink Operator - keys: - 0 - 1 + Reduce Output Operator + key expressions: _col0 (type: string), _col1 (type: string) + sort order: ++ + Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE + Reduce Operator Tree: + Select Operator + expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE + File Output Operator + compressed: false + table: + input format: org.apache.hadoop.mapred.SequenceFileInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe - Stage: Stage-2 + Stage: Stage-8 + Conditional Operator + + Stage: Stage-9 + Map Reduce Local Work + Alias -> Map Local Tables: + a:$INTNAME1 + Fetch Operator + limit: -1 + Alias -> Map Local Operator Tree: + a:$INTNAME1 + TableScan + HashTable Sink Operator + keys: + 0 + 1 + + Stage: Stage-6 Map Reduce Map Operator Tree: TableScan - alias: src - Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE - Filter Operator - predicate: (key < 10) (type: boolean) - Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE - Select Operator - expressions: key (type: string), value (type: string) - outputColumnNames: _col0, _col1 - Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE - Map Join Operator - condition map: - Inner Join 0 to 1 - keys: - 0 - 1 - outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string) - sort order: ++++ - Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE + Map Join Operator + condition map: + Inner Join 0 to 1 + keys: + 0 + 1 + outputColumnNames: _col0, _col1, _col2, _col3 + File Output Operator + compressed: false + table: + input format: org.apache.hadoop.mapred.SequenceFileInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe Local Work: Map Reduce Local Work + + Stage: Stage-3 + Map Reduce + Map Operator Tree: + TableScan + Reduce Output Operator + key expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string) + sort order: ++++ + Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string), KEY.reducesinkkey2 (type: string), KEY.reducesinkkey3 (type: string) @@ -95,7 +130,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe - Stage: Stage-3 + Stage: Stage-4 Map Reduce Map Operator Tree: TableScan @@ -117,32 +152,128 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + Stage: Stage-10 + Map Reduce Local Work + Alias -> Map Local Tables: + a:$INTNAME + Fetch Operator + limit: -1 + Alias -> Map Local Operator Tree: + a:$INTNAME + TableScan + HashTable Sink Operator + keys: + 0 + 1 + + Stage: Stage-7 + Map Reduce + Map Operator Tree: + TableScan + Map Join Operator + condition map: + Inner Join 0 to 1 + keys: + 0 + 1 + outputColumnNames: _col0, _col1, _col2, _col3 + File Output Operator + compressed: false + table: + input format: org.apache.hadoop.mapred.SequenceFileInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe + Local Work: + Map Reduce Local Work + + Stage: Stage-2 + Map Reduce + Map Operator Tree: + TableScan + Reduce Output Operator + sort order: + Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE + value expressions: _col0 (type: string), _col1 (type: string) + TableScan + Reduce Output Operator + sort order: + Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE + value expressions: _col0 (type: string), _col1 (type: string) + Reduce Operator Tree: + Join Operator + condition map: + Inner Join 0 to 1 + keys: + 0 + 1 + outputColumnNames: _col0, _col1, _col2, _col3 + Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE + File Output Operator + compressed: false + table: + input format: org.apache.hadoop.mapred.SequenceFileInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe + + Stage: Stage-5 + Map Reduce + Map Operator Tree: + TableScan + alias: src + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE + Filter Operator + predicate: (key < 10) (type: boolean) + Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE + Select Operator + expressions: key (type: string), value (type: string) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col0 (type: string), _col1 (type: string) + sort order: ++ + Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE + Reduce Operator Tree: + Select Operator + expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE + File Output Operator + compressed: false + table: + input format: org.apache.hadoop.mapred.SequenceFileInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe + Stage: Stage-0 Fetch Operator limit: -1 Processor Tree: ListSink -Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Stage-2:MAPRED' is a cross product -PREHOOK: query: select sum(hash(a.k1,a.v1,a.k2, a.v2)) +Warning: Map Join MAPJOIN[45][bigTable=?] in task 'Stage-7:MAPRED' is a cross product +Warning: Map Join MAPJOIN[38][bigTable=?] in task 'Stage-6:MAPRED' is a cross product +Warning: Shuffle Join JOIN[12][tables = [src1, src2]] in Stage 'Stage-2:MAPRED' is a cross product +PREHOOK: query: -- SORT_QUERY_RESULTS +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 PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: select sum(hash(a.k1,a.v1,a.k2, a.v2)) +POSTHOOK: query: -- SORT_QUERY_RESULTS +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 POSTHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/auto_join1.q.out b/ql/src/test/results/clientpositive/auto_join1.q.out index 5fb0b6f..e0b273b 100644 --- a/ql/src/test/results/clientpositive/auto_join1.q.out +++ b/ql/src/test/results/clientpositive/auto_join1.q.out @@ -6,12 +6,14 @@ POSTHOOK: query: CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 -PREHOOK: query: explain -FROM src src1 JOIN src src2 ON (src1.key = src2.key) +PREHOOK: query: -- SORT_QUERY_RESULTS +explain +FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value PREHOOK: type: QUERY -POSTHOOK: query: explain -FROM src src1 JOIN src src2 ON (src1.key = src2.key) +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain +FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -93,12 +95,14 @@ STAGE PLANS: Stage: Stage-2 Stats-Aggr Operator -PREHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key) +PREHOOK: query: -- SORT_QUERY_RESULTS +FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@dest_j1 -POSTHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key) +POSTHOOK: query: -- SORT_QUERY_RESULTS +FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src diff --git a/ql/src/test/results/clientpositive/auto_join29.q.out b/ql/src/test/results/clientpositive/auto_join29.q.out index 724d7ea..9bdf451 100644 --- a/ql/src/test/results/clientpositive/auto_join29.q.out +++ b/ql/src/test/results/clientpositive/auto_join29.q.out @@ -103,11 +103,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -611,10 +613,12 @@ NULL NULL NULL NULL 97 val_97 NULL NULL NULL NULL 97 val_97 NULL NULL NULL NULL 98 val_98 NULL NULL NULL NULL 98 val_98 -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -715,11 +719,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -1223,10 +1229,12 @@ POSTHOOK: Input: default@src 97 val_97 NULL NULL NULL NULL 98 val_98 NULL NULL NULL NULL 98 val_98 NULL NULL NULL NULL -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -1327,11 +1335,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -1847,10 +1857,12 @@ NULL NULL 97 val_97 NULL NULL NULL NULL 97 val_97 NULL NULL NULL NULL 98 val_98 NULL NULL NULL NULL 98 val_98 NULL NULL -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -1948,11 +1960,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -2468,10 +2482,12 @@ NULL NULL NULL NULL 97 val_97 NULL NULL NULL NULL 97 val_97 NULL NULL NULL NULL 98 val_98 NULL NULL NULL NULL 98 val_98 -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -2563,18 +2579,22 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -2675,11 +2695,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -3183,10 +3205,12 @@ NULL NULL NULL NULL 97 val_97 NULL NULL NULL NULL 97 val_97 NULL NULL NULL NULL 98 val_98 NULL NULL NULL NULL 98 val_98 -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -3287,18 +3311,22 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -3402,11 +3430,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -3432,10 +3462,12 @@ NULL NULL 5 val_5 5 val_5 NULL NULL 5 val_5 5 val_5 NULL NULL 8 val_8 8 val_8 NULL NULL 9 val_9 9 val_9 -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -3527,11 +3559,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/cbo_gby.q.out b/ql/src/test/results/clientpositive/cbo_gby.q.out index 3dc8914..c4e848d 100644 --- a/ql/src/test/results/clientpositive/cbo_gby.q.out +++ b/ql/src/test/results/clientpositive/cbo_gby.q.out @@ -1,34 +1,39 @@ PREHOOK: query: -- 6. Test Select + TS + Join + Fil + GB + GB Having +-- SORT_QUERY_RESULTS select key, (c_int+1)+2 as x, sum(c_int) from cbo_t1 group by c_float, cbo_t1.c_int, key PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### POSTHOOK: query: -- 6. Test Select + TS + Join + Fil + GB + GB Having +-- SORT_QUERY_RESULTS select key, (c_int+1)+2 as x, sum(c_int) from cbo_t1 group by c_float, cbo_t1.c_int, key POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -NULL NULL NULL 1 4 2 1 4 2 1 4 12 1 4 2 -PREHOOK: query: select x, y, count(*) from (select key, (c_int+c_float+1+2) as x, sum(c_int) as y from cbo_t1 group by c_float, cbo_t1.c_int, key) R group by y, x +NULL NULL NULL +PREHOOK: query: --SORT_QUERY_RESULTS +select x, y, count(*) from (select key, (c_int+c_float+1+2) as x, sum(c_int) as y from cbo_t1 group by c_float, cbo_t1.c_int, key) R group by y, x PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -POSTHOOK: query: select x, y, count(*) from (select key, (c_int+c_float+1+2) as x, sum(c_int) as y from cbo_t1 group by c_float, cbo_t1.c_int, key) R group by y, x +POSTHOOK: query: --SORT_QUERY_RESULTS +select x, y, count(*) from (select key, (c_int+c_float+1+2) as x, sum(c_int) as y from cbo_t1 group by c_float, cbo_t1.c_int, key) R group by y, x POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -NULL NULL 1 -5.0 2 3 5.0 12 1 -PREHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key order by a) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key order by q/10 desc, r asc) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c order by cbo_t3.c_int+c desc, c +5.0 2 3 +NULL NULL 1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key order by a) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key order by q/10 desc, r asc) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c order by cbo_t3.c_int+c desc, c PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 @@ -36,7 +41,8 @@ PREHOOK: Input: default@cbo_t2 PREHOOK: Input: default@cbo_t2@dt=2014 PREHOOK: Input: default@cbo_t3 #### A masked pattern was here #### -POSTHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key order by a) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key order by q/10 desc, r asc) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c order by cbo_t3.c_int+c desc, c +POSTHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key order by a) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key order by q/10 desc, r asc) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c order by cbo_t3.c_int+c desc, c POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 @@ -46,7 +52,8 @@ POSTHOOK: Input: default@cbo_t3 #### A masked pattern was here #### 1 12 6 1 2 6 -PREHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b % c asc, b desc) cbo_t1 left outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p left outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int % c asc, cbo_t3.c_int desc +PREHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b % c asc, b desc) cbo_t1 left outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p left outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int % c asc, cbo_t3.c_int desc PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 @@ -54,7 +61,8 @@ PREHOOK: Input: default@cbo_t2 PREHOOK: Input: default@cbo_t2@dt=2014 PREHOOK: Input: default@cbo_t3 #### A masked pattern was here #### -POSTHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b % c asc, b desc) cbo_t1 left outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p left outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int % c asc, cbo_t3.c_int desc +POSTHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b % c asc, b desc) cbo_t1 left outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p left outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int % c asc, cbo_t3.c_int desc POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 @@ -64,7 +72,8 @@ POSTHOOK: Input: default@cbo_t3 #### A masked pattern was here #### 1 12 6 1 2 6 -PREHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b+c, a desc) cbo_t1 right outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p right outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 2) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c +PREHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b+c, a desc) cbo_t1 right outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p right outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 2) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 @@ -72,7 +81,8 @@ PREHOOK: Input: default@cbo_t2 PREHOOK: Input: default@cbo_t2@dt=2014 PREHOOK: Input: default@cbo_t3 #### A masked pattern was here #### -POSTHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b+c, a desc) cbo_t1 right outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p right outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 2) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c +POSTHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b+c, a desc) cbo_t1 right outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p right outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 2) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 @@ -80,9 +90,10 @@ POSTHOOK: Input: default@cbo_t2 POSTHOOK: Input: default@cbo_t2@dt=2014 POSTHOOK: Input: default@cbo_t3 #### A masked pattern was here #### -1 2 6 1 12 6 -PREHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by c+a desc) cbo_t1 full outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by p+q desc, r asc) cbo_t2 on cbo_t1.a=p full outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int +1 2 6 +PREHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by c+a desc) cbo_t1 full outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by p+q desc, r asc) cbo_t2 on cbo_t1.a=p full outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 @@ -90,7 +101,8 @@ PREHOOK: Input: default@cbo_t2 PREHOOK: Input: default@cbo_t2@dt=2014 PREHOOK: Input: default@cbo_t3 #### A masked pattern was here #### -POSTHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by c+a desc) cbo_t1 full outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by p+q desc, r asc) cbo_t2 on cbo_t1.a=p full outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int +POSTHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by c+a desc) cbo_t1 full outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by p+q desc, r asc) cbo_t2 on cbo_t1.a=p full outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 @@ -100,7 +112,8 @@ POSTHOOK: Input: default@cbo_t3 #### A masked pattern was here #### 1 12 6 1 2 6 -PREHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c +PREHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 @@ -108,7 +121,8 @@ PREHOOK: Input: default@cbo_t2 PREHOOK: Input: default@cbo_t2@dt=2014 PREHOOK: Input: default@cbo_t3 #### A masked pattern was here #### -POSTHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c +POSTHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 @@ -116,5 +130,5 @@ POSTHOOK: Input: default@cbo_t2 POSTHOOK: Input: default@cbo_t2@dt=2014 POSTHOOK: Input: default@cbo_t3 #### A masked pattern was here #### -1 2 6 1 12 6 +1 2 6 diff --git a/ql/src/test/results/clientpositive/cbo_udf_udaf.q.out b/ql/src/test/results/clientpositive/cbo_udf_udaf.q.out index ded043f..ac362d1 100644 --- a/ql/src/test/results/clientpositive/cbo_udf_udaf.q.out +++ b/ql/src/test/results/clientpositive/cbo_udf_udaf.q.out @@ -21,8 +21,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -2 0 NULL NULL NULL NULL 3 6 18 18 18 1.0 1 1 2 36 +2 0 NULL NULL NULL NULL 3 6 PREHOOK: query: select * from (select count(*) as a, count(distinct c_int) as b, sum(c_int) as c, avg(c_int) as d, max(c_int) as e, min(c_int) as f from cbo_t1) cbo_t1 PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 @@ -44,8 +44,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -2 0 NULL NULL NULL NULL 3 6 18 1 18 1.0 1 1 2 36 +2 0 NULL NULL NULL NULL 3 6 PREHOOK: query: select f,a,e,b from (select count(*) as a, count(c_int) as b, sum(c_int) as c, avg(c_int) as d, max(c_int) as e, min(c_int) as f from cbo_t1) cbo_t1 PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 @@ -68,21 +68,23 @@ POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### 1 20 1 1 -PREHOOK: query: select key,count(c_int) as a, avg(c_float) from cbo_t1 group by key order by a +PREHOOK: query: -- SORT_QUERY_RESULTS +select key,count(c_int) as a, avg(c_float) from cbo_t1 group by key order by a PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -POSTHOOK: query: select key,count(c_int) as a, avg(c_float) from cbo_t1 group by key order by a +POSTHOOK: query: -- SORT_QUERY_RESULTS +select key,count(c_int) as a, avg(c_float) from cbo_t1 group by key order by a POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -NULL 0 NULL -1 2 1.0 - 1 2 1.0 1 2 1.0 + 1 2 1.0 1 12 1.0 +1 2 1.0 +NULL 0 NULL PREHOOK: query: select count(distinct c_int) as a, avg(c_float) from cbo_t1 group by c_float order by a PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 diff --git a/ql/src/test/results/clientpositive/cbo_windowing.q.out b/ql/src/test/results/clientpositive/cbo_windowing.q.out index 1a274b0..c05ad20 100644 --- a/ql/src/test/results/clientpositive/cbo_windowing.q.out +++ b/ql/src/test/results/clientpositive/cbo_windowing.q.out @@ -1,10 +1,12 @@ PREHOOK: query: -- 9. Test Windowing Functions +-- SORT_QUERY_RESULTS select count(c_int) over() from cbo_t1 PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### POSTHOOK: query: -- 9. Test Windowing Functions +-- SORT_QUERY_RESULTS select count(c_int) over() from cbo_t1 POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 @@ -30,25 +32,19 @@ POSTHOOK: Input: default@cbo_t1@dt=2014 18 18 18 -PREHOOK: query: select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1 PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -POSTHOOK: query: select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1 POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### 18 18.0 1 1 1 1 1 0.0 1 NULL -18 18.0 1 1 2 1 1 0.0 1 NULL -18 18.0 1 1 3 1 1 0.0 1 NULL -18 18.0 1 1 4 1 1 0.0 1 NULL -18 18.0 1 1 5 1 1 0.0 1 1.0 -18 18.0 1 1 6 1 1 0.0 1 1.0 -18 18.0 1 1 7 1 1 0.0 1 1.0 -18 18.0 1 1 8 1 1 0.0 1 1.0 -18 18.0 1 1 9 1 1 0.0 1 1.0 18 18.0 1 1 10 1 1 0.0 1 1.0 18 18.0 1 1 11 1 1 0.0 1 1.0 18 18.0 1 1 12 1 1 0.0 1 1.0 @@ -59,26 +55,28 @@ POSTHOOK: Input: default@cbo_t1@dt=2014 18 18.0 1 1 17 1 1 0.0 1 1.0 18 18.0 1 1 18 1 1 0.0 1 1.0 18 18.0 1 1 19 1 1 0.0 1 1.0 +18 18.0 1 1 2 1 1 0.0 1 NULL 18 18.0 1 1 20 1 1 0.0 1 1.0 -PREHOOK: query: select * from (select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1) cbo_t1 +18 18.0 1 1 3 1 1 0.0 1 NULL +18 18.0 1 1 4 1 1 0.0 1 NULL +18 18.0 1 1 5 1 1 0.0 1 1.0 +18 18.0 1 1 6 1 1 0.0 1 1.0 +18 18.0 1 1 7 1 1 0.0 1 1.0 +18 18.0 1 1 8 1 1 0.0 1 1.0 +18 18.0 1 1 9 1 1 0.0 1 1.0 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from (select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1) cbo_t1 PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -POSTHOOK: query: select * from (select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1) cbo_t1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from (select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1) cbo_t1 POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### 18 18.0 1 1 1 1 1 0.0 1 NULL -18 18.0 1 1 2 1 1 0.0 1 NULL -18 18.0 1 1 3 1 1 0.0 1 NULL -18 18.0 1 1 4 1 1 0.0 1 NULL -18 18.0 1 1 5 1 1 0.0 1 1.0 -18 18.0 1 1 6 1 1 0.0 1 1.0 -18 18.0 1 1 7 1 1 0.0 1 1.0 -18 18.0 1 1 8 1 1 0.0 1 1.0 -18 18.0 1 1 9 1 1 0.0 1 1.0 18 18.0 1 1 10 1 1 0.0 1 1.0 18 18.0 1 1 11 1 1 0.0 1 1.0 18 18.0 1 1 12 1 1 0.0 1 1.0 @@ -89,13 +87,23 @@ POSTHOOK: Input: default@cbo_t1@dt=2014 18 18.0 1 1 17 1 1 0.0 1 1.0 18 18.0 1 1 18 1 1 0.0 1 1.0 18 18.0 1 1 19 1 1 0.0 1 1.0 +18 18.0 1 1 2 1 1 0.0 1 NULL 18 18.0 1 1 20 1 1 0.0 1 1.0 -PREHOOK: query: select x from (select count(c_int) over() as x, sum(c_float) over() from cbo_t1) cbo_t1 +18 18.0 1 1 3 1 1 0.0 1 NULL +18 18.0 1 1 4 1 1 0.0 1 NULL +18 18.0 1 1 5 1 1 0.0 1 1.0 +18 18.0 1 1 6 1 1 0.0 1 1.0 +18 18.0 1 1 7 1 1 0.0 1 1.0 +18 18.0 1 1 8 1 1 0.0 1 1.0 +18 18.0 1 1 9 1 1 0.0 1 1.0 +PREHOOK: query: -- SORT_QUERY_RESULTS +select x from (select count(c_int) over() as x, sum(c_float) over() from cbo_t1) cbo_t1 PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -POSTHOOK: query: select x from (select count(c_int) over() as x, sum(c_float) over() from cbo_t1) cbo_t1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select x from (select count(c_int) over() as x, sum(c_float) over() from cbo_t1) cbo_t1 POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 @@ -120,12 +128,14 @@ POSTHOOK: Input: default@cbo_t1@dt=2014 18 18 18 -PREHOOK: query: select 1+sum(c_int) over() from cbo_t1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select 1+sum(c_int) over() from cbo_t1 PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -POSTHOOK: query: select 1+sum(c_int) over() from cbo_t1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select 1+sum(c_int) over() from cbo_t1 POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 @@ -150,34 +160,41 @@ POSTHOOK: Input: default@cbo_t1@dt=2014 19 19 19 -PREHOOK: query: select sum(c_int)+sum(sum(c_int)) over() from cbo_t1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select sum(c_int)+sum(sum(c_int)) over() from cbo_t1 PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -POSTHOOK: query: select sum(c_int)+sum(sum(c_int)) over() from cbo_t1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select sum(c_int)+sum(sum(c_int)) over() from cbo_t1 POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### 36 -PREHOOK: query: select * from (select max(c_int) over (partition by key order by value Rows UNBOUNDED PRECEDING), min(c_int) over (partition by key order by value rows current row), count(c_int) over(partition by key order by value ROWS 1 PRECEDING), avg(value) over (partition by key order by value Rows between unbounded preceding and unbounded following), sum(value) over (partition by key order by value rows between unbounded preceding and current row), avg(c_float) over (partition by key order by value Rows between 1 preceding and unbounded following), sum(c_float) over (partition by key order by value rows between 1 preceding and current row), max(c_float) over (partition by key order by value rows between 1 preceding and unbounded following), min(c_float) over (partition by key order by value rows between 1 preceding and 1 following) from cbo_t1) cbo_t1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from (select max(c_int) over (partition by key order by value Rows UNBOUNDED PRECEDING), min(c_int) over (partition by key order by value rows current row), count(c_int) over(partition by key order by value ROWS 1 PRECEDING), avg(value) over (partition by key order by value Rows between unbounded preceding and unbounded following), sum(value) over (partition by key order by value rows between unbounded preceding and current row), avg(c_float) over (partition by key order by value Rows between 1 preceding and unbounded following), sum(c_float) over (partition by key order by value rows between 1 preceding and current row), max(c_float) over (partition by key order by value rows between 1 preceding and unbounded following), min(c_float) over (partition by key order by value rows between 1 preceding and 1 following) from cbo_t1) cbo_t1 PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -POSTHOOK: query: select * from (select max(c_int) over (partition by key order by value Rows UNBOUNDED PRECEDING), min(c_int) over (partition by key order by value rows current row), count(c_int) over(partition by key order by value ROWS 1 PRECEDING), avg(value) over (partition by key order by value Rows between unbounded preceding and unbounded following), sum(value) over (partition by key order by value rows between unbounded preceding and current row), avg(c_float) over (partition by key order by value Rows between 1 preceding and unbounded following), sum(c_float) over (partition by key order by value rows between 1 preceding and current row), max(c_float) over (partition by key order by value rows between 1 preceding and unbounded following), min(c_float) over (partition by key order by value rows between 1 preceding and 1 following) from cbo_t1) cbo_t1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from (select max(c_int) over (partition by key order by value Rows UNBOUNDED PRECEDING), min(c_int) over (partition by key order by value rows current row), count(c_int) over(partition by key order by value ROWS 1 PRECEDING), avg(value) over (partition by key order by value Rows between unbounded preceding and unbounded following), sum(value) over (partition by key order by value rows between unbounded preceding and current row), avg(c_float) over (partition by key order by value Rows between 1 preceding and unbounded following), sum(c_float) over (partition by key order by value rows between 1 preceding and current row), max(c_float) over (partition by key order by value rows between 1 preceding and unbounded following), min(c_float) over (partition by key order by value rows between 1 preceding and 1 following) from cbo_t1) cbo_t1 POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -NULL NULL 0 NULL NULL NULL NULL NULL NULL -NULL NULL 0 NULL NULL NULL NULL NULL NULL 1 1 1 1.0 1.0 1.0 1.0 1.0 1.0 -1 1 2 1.0 2.0 1.0 2.0 1.0 1.0 1 1 1 1.0 1.0 1.0 1.0 1.0 1.0 -1 1 2 1.0 2.0 1.0 2.0 1.0 1.0 1 1 1 1.0 1.0 1.0 1.0 1.0 1.0 +1 1 1 1.0 1.0 1.0 1.0 1.0 1.0 +1 1 2 1.0 10.0 1.0 2.0 1.0 1.0 +1 1 2 1.0 11.0 1.0 2.0 1.0 1.0 +1 1 2 1.0 12.0 1.0 2.0 1.0 1.0 +1 1 2 1.0 2.0 1.0 2.0 1.0 1.0 +1 1 2 1.0 2.0 1.0 2.0 1.0 1.0 +1 1 2 1.0 2.0 1.0 2.0 1.0 1.0 1 1 2 1.0 2.0 1.0 2.0 1.0 1.0 1 1 2 1.0 3.0 1.0 2.0 1.0 1.0 1 1 2 1.0 4.0 1.0 2.0 1.0 1.0 @@ -186,27 +203,20 @@ NULL NULL 0 NULL NULL NULL NULL NULL NULL 1 1 2 1.0 7.0 1.0 2.0 1.0 1.0 1 1 2 1.0 8.0 1.0 2.0 1.0 1.0 1 1 2 1.0 9.0 1.0 2.0 1.0 1.0 -1 1 2 1.0 10.0 1.0 2.0 1.0 1.0 -1 1 2 1.0 11.0 1.0 2.0 1.0 1.0 -1 1 2 1.0 12.0 1.0 2.0 1.0 1.0 -1 1 1 1.0 1.0 1.0 1.0 1.0 1.0 -1 1 2 1.0 2.0 1.0 2.0 1.0 1.0 -PREHOOK: query: select i, a, h, b, c, d, e, f, g, a as x, a +1 as y from (select max(c_int) over (partition by key order by value range UNBOUNDED PRECEDING) a, min(c_int) over (partition by key order by value range current row) b, count(c_int) over(partition by key order by value range 1 PRECEDING) c, avg(value) over (partition by key order by value range between unbounded preceding and unbounded following) d, sum(value) over (partition by key order by value range between unbounded preceding and current row) e, avg(c_float) over (partition by key order by value range between 1 preceding and unbounded following) f, sum(c_float) over (partition by key order by value range between 1 preceding and current row) g, max(c_float) over (partition by key order by value range between 1 preceding and unbounded following) h, min(c_float) over (partition by key order by value range between 1 preceding and 1 following) i from cbo_t1) cbo_t1 +NULL NULL 0 NULL NULL NULL NULL NULL NULL +NULL NULL 0 NULL NULL NULL NULL NULL NULL +PREHOOK: query: -- SORT_QUERY_RESULTS +select i, a, h, b, c, d, e, f, g, a as x, a +1 as y from (select max(c_int) over (partition by key order by value range UNBOUNDED PRECEDING) a, min(c_int) over (partition by key order by value range current row) b, count(c_int) over(partition by key order by value range 1 PRECEDING) c, avg(value) over (partition by key order by value range between unbounded preceding and unbounded following) d, sum(value) over (partition by key order by value range between unbounded preceding and current row) e, avg(c_float) over (partition by key order by value range between 1 preceding and unbounded following) f, sum(c_float) over (partition by key order by value range between 1 preceding and current row) g, max(c_float) over (partition by key order by value range between 1 preceding and unbounded following) h, min(c_float) over (partition by key order by value range between 1 preceding and 1 following) i from cbo_t1) cbo_t1 PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -POSTHOOK: query: select i, a, h, b, c, d, e, f, g, a as x, a +1 as y from (select max(c_int) over (partition by key order by value range UNBOUNDED PRECEDING) a, min(c_int) over (partition by key order by value range current row) b, count(c_int) over(partition by key order by value range 1 PRECEDING) c, avg(value) over (partition by key order by value range between unbounded preceding and unbounded following) d, sum(value) over (partition by key order by value range between unbounded preceding and current row) e, avg(c_float) over (partition by key order by value range between 1 preceding and unbounded following) f, sum(c_float) over (partition by key order by value range between 1 preceding and current row) g, max(c_float) over (partition by key order by value range between 1 preceding and unbounded following) h, min(c_float) over (partition by key order by value range between 1 preceding and 1 following) i from cbo_t1) cbo_t1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select i, a, h, b, c, d, e, f, g, a as x, a +1 as y from (select max(c_int) over (partition by key order by value range UNBOUNDED PRECEDING) a, min(c_int) over (partition by key order by value range current row) b, count(c_int) over(partition by key order by value range 1 PRECEDING) c, avg(value) over (partition by key order by value range between unbounded preceding and unbounded following) d, sum(value) over (partition by key order by value range between unbounded preceding and current row) e, avg(c_float) over (partition by key order by value range between 1 preceding and unbounded following) f, sum(c_float) over (partition by key order by value range between 1 preceding and current row) g, max(c_float) over (partition by key order by value range between 1 preceding and unbounded following) h, min(c_float) over (partition by key order by value range between 1 preceding and 1 following) i from cbo_t1) cbo_t1 POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -NULL NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL -NULL NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL -1.0 1 1.0 1 2 1.0 2.0 1.0 2.0 1 2 -1.0 1 1.0 1 2 1.0 2.0 1.0 2.0 1 2 -1.0 1 1.0 1 2 1.0 2.0 1.0 2.0 1 2 -1.0 1 1.0 1 2 1.0 2.0 1.0 2.0 1 2 1.0 1 1.0 1 12 1.0 12.0 1.0 12.0 1 2 1.0 1 1.0 1 12 1.0 12.0 1.0 12.0 1 2 1.0 1 1.0 1 12 1.0 12.0 1.0 12.0 1 2 @@ -221,11 +231,19 @@ NULL NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL 1.0 1 1.0 1 12 1.0 12.0 1.0 12.0 1 2 1.0 1 1.0 1 2 1.0 2.0 1.0 2.0 1 2 1.0 1 1.0 1 2 1.0 2.0 1.0 2.0 1 2 -PREHOOK: query: select *, rank() over(partition by key order by value) as rr from src1 +1.0 1 1.0 1 2 1.0 2.0 1.0 2.0 1 2 +1.0 1 1.0 1 2 1.0 2.0 1.0 2.0 1 2 +1.0 1 1.0 1 2 1.0 2.0 1.0 2.0 1 2 +1.0 1 1.0 1 2 1.0 2.0 1.0 2.0 1 2 +NULL NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL +PREHOOK: query: -- SORT_QUERY_RESULTS +select *, rank() over(partition by key order by value) as rr from src1 PREHOOK: type: QUERY PREHOOK: Input: default@src1 #### A masked pattern was here #### -POSTHOOK: query: select *, rank() over(partition by key order by value) as rr from src1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select *, rank() over(partition by key order by value) as rr from src1 POSTHOOK: type: QUERY POSTHOOK: Input: default@src1 #### A masked pattern was here #### @@ -254,11 +272,13 @@ POSTHOOK: Input: default@src1 406 val_406 1 66 val_66 1 98 val_98 1 -PREHOOK: query: select *, rank() over(partition by key order by value) from src1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select *, rank() over(partition by key order by value) from src1 PREHOOK: type: QUERY PREHOOK: Input: default@src1 #### A masked pattern was here #### -POSTHOOK: query: select *, rank() over(partition by key order by value) from src1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select *, rank() over(partition by key order by value) from src1 POSTHOOK: type: QUERY POSTHOOK: Input: default@src1 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/cross_product_check_1.q.out b/ql/src/test/results/clientpositive/cross_product_check_1.q.out index b83cb6f..9148fc9 100644 --- a/ql/src/test/results/clientpositive/cross_product_check_1.q.out +++ b/ql/src/test/results/clientpositive/cross_product_check_1.q.out @@ -25,9 +25,11 @@ POSTHOOK: Input: default@src POSTHOOK: Output: database:default POSTHOOK: Output: default@B Warning: Shuffle Join JOIN[7][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product -PREHOOK: query: explain select * from A join B +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join B PREHOOK: type: QUERY -POSTHOOK: query: explain select * from A join B +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join B POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -83,9 +85,11 @@ STAGE PLANS: ListSink Warning: Shuffle Join JOIN[10][tables = [d1, d2, a]] in Stage 'Stage-2:MAPRED' is a cross product -PREHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from B d1 join B d2 on d1.key = d2.key join A PREHOOK: type: QUERY -POSTHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from B d1 join B d2 on d1.key = d2.key join A POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -179,14 +183,16 @@ STAGE PLANS: ListSink Warning: Shuffle Join JOIN[16][tables = [a, od1]] in Stage 'Stage-3:MAPRED' is a cross product -PREHOOK: query: explain select * from A join +PREHOOK: query: -- SORT_QUERY_RESULTS +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 where 1 = 1 group by d1.key) od1 PREHOOK: type: QUERY -POSTHOOK: query: explain select * from A join +POSTHOOK: query: -- SORT_QUERY_RESULTS +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 where 1 = 1 group by d1.key) od1 POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -308,9 +314,11 @@ STAGE PLANS: Warning: Shuffle Join JOIN[14][tables = [a, od1]] in Stage 'Stage-3:MAPRED' is a cross product Warning: Shuffle Join JOIN[4][tables = [d1, d2]] in Stage 'Stage-1:MAPRED' is a cross product -PREHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 PREHOOK: type: QUERY -POSTHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -421,12 +429,14 @@ STAGE PLANS: ListSink Warning: Shuffle Join JOIN[21][tables = [ss, od1]] in Stage 'Stage-2:MAPRED' is a cross product -PREHOOK: query: explain select * from -(select A.key from A group by key) ss join +PREHOOK: query: -- SORT_QUERY_RESULTS +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 PREHOOK: type: QUERY -POSTHOOK: query: explain select * from -(select A.key from A group by key) ss join +POSTHOOK: query: -- SORT_QUERY_RESULTS +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 POSTHOOK: type: QUERY STAGE DEPENDENCIES: diff --git a/ql/src/test/results/clientpositive/cross_product_check_2.q.out b/ql/src/test/results/clientpositive/cross_product_check_2.q.out index 500f912..60c302a 100644 --- a/ql/src/test/results/clientpositive/cross_product_check_2.q.out +++ b/ql/src/test/results/clientpositive/cross_product_check_2.q.out @@ -11,23 +11,25 @@ POSTHOOK: Input: default@src POSTHOOK: Output: database:default POSTHOOK: Output: default@A PREHOOK: query: create table B as -select * from src +select * from src order by key limit 10 PREHOOK: type: CREATETABLE_AS_SELECT PREHOOK: Input: default@src PREHOOK: Output: database:default PREHOOK: Output: default@B POSTHOOK: query: create table B as -select * from src +select * from src order by key limit 10 POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@src POSTHOOK: Output: database:default POSTHOOK: Output: default@B Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Stage-3:MAPRED' is a cross product -PREHOOK: query: explain select * from A join B +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join B PREHOOK: type: QUERY -POSTHOOK: query: explain select * from A join B +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join B POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-4 is a root stage @@ -45,11 +47,11 @@ STAGE PLANS: $hdt$_1:b TableScan alias: b - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE HashTable Sink Operator keys: 0 @@ -90,9 +92,11 @@ STAGE PLANS: ListSink Warning: Map Join MAPJOIN[17][bigTable=?] in task 'Stage-5:MAPRED' is a cross product -PREHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from B d1 join B d2 on d1.key = d2.key join A PREHOOK: type: QUERY -POSTHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from B d1 join B d2 on d1.key = d2.key join A POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-7 is a root stage @@ -121,10 +125,10 @@ STAGE PLANS: d1 TableScan alias: d1 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE Column stats: NONE HashTable Sink Operator keys: 0 key (type: string) @@ -135,10 +139,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d2 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -146,7 +150,7 @@ STAGE PLANS: 0 key (type: string) 1 key (type: string) outputColumnNames: _col0, _col1, _col5, _col6 - Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -176,12 +180,14 @@ STAGE PLANS: ListSink Warning: Map Join MAPJOIN[25][bigTable=?] in task 'Stage-6:MAPRED' is a cross product -PREHOOK: query: explain select * from A join +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join (select d1.key from B d1 join B d2 on d1.key = d2.key where 1 = 1 group by d1.key) od1 PREHOOK: type: QUERY -POSTHOOK: query: explain select * from A join +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join (select d1.key from B d1 join B d2 on d1.key = d2.key where 1 = 1 group by d1.key) od1 @@ -204,10 +210,10 @@ STAGE PLANS: od1:d1 TableScan alias: d1 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE Column stats: NONE HashTable Sink Operator keys: 0 key (type: string) @@ -218,10 +224,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d2 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -229,17 +235,17 @@ STAGE PLANS: 0 key (type: string) 1 key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: _col0 (type: string) mode: hash outputColumnNames: _col0 - Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE Local Work: Map Reduce Local Work Reduce Operator Tree: @@ -247,7 +253,7 @@ STAGE PLANS: keys: KEY._col0 (type: string) mode: mergepartial outputColumnNames: _col0 - Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 2 Data size: 20 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false table: @@ -305,9 +311,11 @@ STAGE PLANS: Warning: Map Join MAPJOIN[21][bigTable=?] in task 'Stage-6:MAPRED' is a cross product Warning: Map Join MAPJOIN[22][bigTable=d2] in task 'Stage-2:MAPRED' is a cross product -PREHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 PREHOOK: type: QUERY -POSTHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-9 is a root stage @@ -327,7 +335,7 @@ STAGE PLANS: od1:d1 TableScan alias: d1 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE HashTable Sink Operator keys: 0 @@ -338,7 +346,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d2 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: COMPLETE Map Join Operator condition map: Inner Join 0 to 1 @@ -346,17 +354,17 @@ STAGE PLANS: 0 1 outputColumnNames: _col0 - Statistics: Num rows: 11 Data size: 114 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 105 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: _col0 (type: string) mode: hash outputColumnNames: _col0 - Statistics: Num rows: 11 Data size: 114 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 105 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 11 Data size: 114 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 105 Basic stats: COMPLETE Column stats: NONE Local Work: Map Reduce Local Work Reduce Operator Tree: @@ -364,7 +372,7 @@ STAGE PLANS: keys: KEY._col0 (type: string) mode: mergepartial outputColumnNames: _col0 - Statistics: Num rows: 5 Data size: 51 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 47 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false table: @@ -423,11 +431,13 @@ STAGE PLANS: Warning: Map Join MAPJOIN[45][bigTable=?] in task 'Stage-7:MAPRED' is a cross product Warning: Map Join MAPJOIN[38][bigTable=?] in task 'Stage-6:MAPRED' is a cross product Warning: Shuffle Join JOIN[21][tables = [ss, od1]] in Stage 'Stage-2:MAPRED' is a cross product -PREHOOK: query: explain select * from +PREHOOK: query: -- SORT_QUERY_RESULTS +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 PREHOOK: type: QUERY -POSTHOOK: query: explain select * from +POSTHOOK: query: -- SORT_QUERY_RESULTS +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 POSTHOOK: type: QUERY @@ -559,7 +569,7 @@ STAGE PLANS: TableScan Reduce Output Operator sort order: - Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 2 Data size: 20 Basic stats: COMPLETE Column stats: NONE value expressions: _col0 (type: string) Reduce Operator Tree: Join Operator @@ -588,10 +598,10 @@ STAGE PLANS: od1:d1 TableScan alias: d1 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE Column stats: NONE HashTable Sink Operator keys: 0 key (type: string) @@ -602,10 +612,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d2 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -613,17 +623,17 @@ STAGE PLANS: 0 key (type: string) 1 key (type: string) outputColumnNames: _col0 - Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: _col0 (type: string) mode: hash outputColumnNames: _col0 - Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE Local Work: Map Reduce Local Work Reduce Operator Tree: @@ -631,7 +641,7 @@ STAGE PLANS: keys: KEY._col0 (type: string) mode: mergepartial outputColumnNames: _col0 - Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 2 Data size: 20 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false table: diff --git a/ql/src/test/results/clientpositive/ctas.q.out b/ql/src/test/results/clientpositive/ctas.q.out index 586a832..332f8ef 100644 --- a/ql/src/test/results/clientpositive/ctas.q.out +++ b/ql/src/test/results/clientpositive/ctas.q.out @@ -112,11 +112,13 @@ POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@src POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_CTAS1 -PREHOOK: query: select * from nzhang_CTAS1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_CTAS1 PREHOOK: type: QUERY PREHOOK: Input: default@nzhang_ctas1 #### A masked pattern was here #### -POSTHOOK: query: select * from nzhang_CTAS1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_CTAS1 POSTHOOK: type: QUERY POSTHOOK: Input: default@nzhang_ctas1 #### A masked pattern was here #### @@ -260,11 +262,13 @@ POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@src POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_ctas2 -PREHOOK: query: select * from nzhang_ctas2 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas2 PREHOOK: type: QUERY PREHOOK: Input: default@nzhang_ctas2 #### A masked pattern was here #### -POSTHOOK: query: select * from nzhang_ctas2 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas2 POSTHOOK: type: QUERY POSTHOOK: Input: default@nzhang_ctas2 #### A masked pattern was here #### @@ -408,11 +412,13 @@ POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@src POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_ctas3 -PREHOOK: query: select * from nzhang_ctas3 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas3 PREHOOK: type: QUERY PREHOOK: Input: default@nzhang_ctas3 #### A masked pattern was here #### -POSTHOOK: query: select * from nzhang_ctas3 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas3 POSTHOOK: type: QUERY POSTHOOK: Input: default@nzhang_ctas3 #### A masked pattern was here #### @@ -473,11 +479,13 @@ PREHOOK: query: create table if not exists nzhang_ctas3 as select key, value fro PREHOOK: type: CREATETABLE POSTHOOK: query: create table if not exists nzhang_ctas3 as select key, value from src sort by key, value limit 2 POSTHOOK: type: CREATETABLE -PREHOOK: query: select * from nzhang_ctas3 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas3 PREHOOK: type: QUERY PREHOOK: Input: default@nzhang_ctas3 #### A masked pattern was here #### -POSTHOOK: query: select * from nzhang_ctas3 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas3 POSTHOOK: type: QUERY POSTHOOK: Input: default@nzhang_ctas3 #### A masked pattern was here #### @@ -622,11 +630,13 @@ POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@src POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_ctas4 -PREHOOK: query: select * from nzhang_ctas4 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas4 PREHOOK: type: QUERY PREHOOK: Input: default@nzhang_ctas4 #### A masked pattern was here #### -POSTHOOK: query: select * from nzhang_ctas4 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas4 POSTHOOK: type: QUERY POSTHOOK: Input: default@nzhang_ctas4 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/dynpart_sort_optimization2.q.out b/ql/src/test/results/clientpositive/dynpart_sort_optimization2.q.out index 153e9bf..0dd5445 100644 --- a/ql/src/test/results/clientpositive/dynpart_sort_optimization2.q.out +++ b/ql/src/test/results/clientpositive/dynpart_sort_optimization2.q.out @@ -50,7 +50,8 @@ POSTHOOK: query: load data local inpath '../../data/files/dynpart_test.txt' over POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@ss -PREHOOK: query: explain insert overwrite table ss_part partition (ss_sold_date_sk) +PREHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -61,7 +62,8 @@ select ss_net_paid_inc_tax, ss_net_profit distribute by ss_sold_date_sk PREHOOK: type: QUERY -POSTHOOK: query: explain insert overwrite table ss_part partition (ss_sold_date_sk) +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -131,7 +133,8 @@ STAGE PLANS: Stage: Stage-2 Stats-Aggr Operator -PREHOOK: query: insert overwrite table ss_part partition (ss_sold_date_sk) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -144,7 +147,8 @@ select ss_net_paid_inc_tax, PREHOOK: type: QUERY PREHOOK: Input: default@ss PREHOOK: Output: default@ss_part -POSTHOOK: query: insert overwrite table ss_part partition (ss_sold_date_sk) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -203,27 +207,29 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part where ss_sold_date_sk=2452617 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452617 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part PREHOOK: Input: default@ss_part@ss_sold_date_sk=2452617 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part where ss_sold_date_sk=2452617 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452617 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part POSTHOOK: Input: default@ss_part@ss_sold_date_sk=2452617 #### A masked pattern was here #### +10022.63 3952.8 2452617 +1765.07 -4648.8 2452617 2.1 -2026.3 2452617 2.99 -11.32 2452617 -85.8 25.61 2452617 -552.96 -1363.84 2452617 -565.92 196.48 2452617 -879.07 -2185.76 2452617 -1765.07 -4648.8 2452617 3423.95 -3164.07 2452617 5362.01 -600.28 2452617 +552.96 -1363.84 2452617 +565.92 196.48 2452617 7412.83 2071.68 2452617 -10022.63 3952.8 2452617 +85.8 25.61 2452617 +879.07 -2185.76 2452617 PREHOOK: query: desc formatted ss_part partition(ss_sold_date_sk=2452638) PREHOOK: type: DESCTABLE PREHOOK: Input: default@ss_part @@ -265,30 +271,33 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part where ss_sold_date_sk=2452638 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452638 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part PREHOOK: Input: default@ss_part@ss_sold_date_sk=2452638 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part where ss_sold_date_sk=2452638 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452638 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part POSTHOOK: Input: default@ss_part@ss_sold_date_sk=2452638 #### A masked pattern was here #### 0.15 -241.22 2452638 +10171.1 660.48 2452638 +1327.08 57.97 2452638 +1413.19 178.08 2452638 150.39 -162.12 2452638 +1524.33 494.37 2452638 156.67 -4626.56 2452638 181.03 -207.24 2452638 +1971.35 -488.25 2452638 267.01 -3266.36 2452638 317.87 -3775.38 2452638 -1327.08 57.97 2452638 -1413.19 178.08 2452638 -1524.33 494.37 2452638 -1971.35 -488.25 2452638 4133.98 -775.72 2452638 4329.49 -4000.51 2452638 -10171.1 660.48 2452638 -PREHOOK: query: explain insert overwrite table ss_part partition (ss_sold_date_sk) +PREHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -296,7 +305,8 @@ select ss_net_paid_inc_tax, where ss_sold_date_sk>=2452617 and ss_sold_date_sk<=2452638 distribute by ss_sold_date_sk PREHOOK: type: QUERY -POSTHOOK: query: explain insert overwrite table ss_part partition (ss_sold_date_sk) +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -358,7 +368,8 @@ STAGE PLANS: Stage: Stage-2 Stats-Aggr Operator -PREHOOK: query: insert overwrite table ss_part partition (ss_sold_date_sk) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -368,7 +379,8 @@ select ss_net_paid_inc_tax, PREHOOK: type: QUERY PREHOOK: Input: default@ss PREHOOK: Output: default@ss_part -POSTHOOK: query: insert overwrite table ss_part partition (ss_sold_date_sk) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -424,27 +436,29 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part where ss_sold_date_sk=2452617 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452617 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part PREHOOK: Input: default@ss_part@ss_sold_date_sk=2452617 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part where ss_sold_date_sk=2452617 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452617 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part POSTHOOK: Input: default@ss_part@ss_sold_date_sk=2452617 #### A masked pattern was here #### 10022.63 3952.8 2452617 +1765.07 -4648.8 2452617 +2.1 -2026.3 2452617 2.99 -11.32 2452617 3423.95 -3164.07 2452617 5362.01 -600.28 2452617 +552.96 -1363.84 2452617 565.92 196.48 2452617 -85.8 25.61 2452617 7412.83 2071.68 2452617 +85.8 25.61 2452617 879.07 -2185.76 2452617 -1765.07 -4648.8 2452617 -552.96 -1363.84 2452617 -2.1 -2026.3 2452617 PREHOOK: query: desc formatted ss_part partition(ss_sold_date_sk=2452638) PREHOOK: type: DESCTABLE PREHOOK: Input: default@ss_part @@ -486,31 +500,34 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part where ss_sold_date_sk=2452638 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452638 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part PREHOOK: Input: default@ss_part@ss_sold_date_sk=2452638 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part where ss_sold_date_sk=2452638 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452638 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part POSTHOOK: Input: default@ss_part@ss_sold_date_sk=2452638 #### A masked pattern was here #### -4329.49 -4000.51 2452638 +0.15 -241.22 2452638 +10171.1 660.48 2452638 +1327.08 57.97 2452638 1413.19 178.08 2452638 150.39 -162.12 2452638 1524.33 494.37 2452638 -0.15 -241.22 2452638 -267.01 -3266.36 2452638 +156.67 -4626.56 2452638 181.03 -207.24 2452638 1971.35 -488.25 2452638 -1327.08 57.97 2452638 -156.67 -4626.56 2452638 +267.01 -3266.36 2452638 317.87 -3775.38 2452638 -10171.1 660.48 2452638 4133.98 -775.72 2452638 +4329.49 -4000.51 2452638 PREHOOK: query: -- SORT DYNAMIC PARTITION DISABLED +-- SORT_QUERY_RESULTS explain insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, @@ -524,6 +541,7 @@ select ss_net_paid_inc_tax, PREHOOK: type: QUERY POSTHOOK: query: -- SORT DYNAMIC PARTITION DISABLED +-- SORT_QUERY_RESULTS explain insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, @@ -594,7 +612,8 @@ STAGE PLANS: Stage: Stage-2 Stats-Aggr Operator -PREHOOK: query: insert overwrite table ss_part partition (ss_sold_date_sk) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -607,7 +626,8 @@ select ss_net_paid_inc_tax, PREHOOK: type: QUERY PREHOOK: Input: default@ss PREHOOK: Output: default@ss_part -POSTHOOK: query: insert overwrite table ss_part partition (ss_sold_date_sk) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -666,27 +686,29 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part where ss_sold_date_sk=2452617 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452617 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part PREHOOK: Input: default@ss_part@ss_sold_date_sk=2452617 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part where ss_sold_date_sk=2452617 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452617 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part POSTHOOK: Input: default@ss_part@ss_sold_date_sk=2452617 #### A masked pattern was here #### +10022.63 3952.8 2452617 +1765.07 -4648.8 2452617 2.1 -2026.3 2452617 2.99 -11.32 2452617 -85.8 25.61 2452617 -552.96 -1363.84 2452617 -565.92 196.48 2452617 -879.07 -2185.76 2452617 -1765.07 -4648.8 2452617 3423.95 -3164.07 2452617 5362.01 -600.28 2452617 +552.96 -1363.84 2452617 +565.92 196.48 2452617 7412.83 2071.68 2452617 -10022.63 3952.8 2452617 +85.8 25.61 2452617 +879.07 -2185.76 2452617 PREHOOK: query: desc formatted ss_part partition(ss_sold_date_sk=2452638) PREHOOK: type: DESCTABLE PREHOOK: Input: default@ss_part @@ -728,30 +750,33 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part where ss_sold_date_sk=2452638 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452638 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part PREHOOK: Input: default@ss_part@ss_sold_date_sk=2452638 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part where ss_sold_date_sk=2452638 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452638 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part POSTHOOK: Input: default@ss_part@ss_sold_date_sk=2452638 #### A masked pattern was here #### 0.15 -241.22 2452638 +10171.1 660.48 2452638 +1327.08 57.97 2452638 +1413.19 178.08 2452638 150.39 -162.12 2452638 +1524.33 494.37 2452638 156.67 -4626.56 2452638 181.03 -207.24 2452638 +1971.35 -488.25 2452638 267.01 -3266.36 2452638 317.87 -3775.38 2452638 -1327.08 57.97 2452638 -1413.19 178.08 2452638 -1524.33 494.37 2452638 -1971.35 -488.25 2452638 4133.98 -775.72 2452638 4329.49 -4000.51 2452638 -10171.1 660.48 2452638 -PREHOOK: query: explain insert overwrite table ss_part partition (ss_sold_date_sk) +PREHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -759,7 +784,8 @@ select ss_net_paid_inc_tax, where ss_sold_date_sk>=2452617 and ss_sold_date_sk<=2452638 distribute by ss_sold_date_sk PREHOOK: type: QUERY -POSTHOOK: query: explain insert overwrite table ss_part partition (ss_sold_date_sk) +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -820,7 +846,8 @@ STAGE PLANS: Stage: Stage-2 Stats-Aggr Operator -PREHOOK: query: insert overwrite table ss_part partition (ss_sold_date_sk) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -830,7 +857,8 @@ select ss_net_paid_inc_tax, PREHOOK: type: QUERY PREHOOK: Input: default@ss PREHOOK: Output: default@ss_part -POSTHOOK: query: insert overwrite table ss_part partition (ss_sold_date_sk) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -886,27 +914,29 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part where ss_sold_date_sk=2452617 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452617 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part PREHOOK: Input: default@ss_part@ss_sold_date_sk=2452617 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part where ss_sold_date_sk=2452617 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452617 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part POSTHOOK: Input: default@ss_part@ss_sold_date_sk=2452617 #### A masked pattern was here #### +10022.63 3952.8 2452617 +1765.07 -4648.8 2452617 +2.1 -2026.3 2452617 +2.99 -11.32 2452617 3423.95 -3164.07 2452617 5362.01 -600.28 2452617 +552.96 -1363.84 2452617 565.92 196.48 2452617 -85.8 25.61 2452617 7412.83 2071.68 2452617 +85.8 25.61 2452617 879.07 -2185.76 2452617 -1765.07 -4648.8 2452617 -552.96 -1363.84 2452617 -2.1 -2026.3 2452617 -10022.63 3952.8 2452617 -2.99 -11.32 2452617 PREHOOK: query: desc formatted ss_part partition(ss_sold_date_sk=2452638) PREHOOK: type: DESCTABLE PREHOOK: Input: default@ss_part @@ -948,31 +978,34 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part where ss_sold_date_sk=2452638 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452638 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part PREHOOK: Input: default@ss_part@ss_sold_date_sk=2452638 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part where ss_sold_date_sk=2452638 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452638 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part POSTHOOK: Input: default@ss_part@ss_sold_date_sk=2452638 #### A masked pattern was here #### -4329.49 -4000.51 2452638 +0.15 -241.22 2452638 +10171.1 660.48 2452638 +1327.08 57.97 2452638 1413.19 178.08 2452638 150.39 -162.12 2452638 1524.33 494.37 2452638 -0.15 -241.22 2452638 -267.01 -3266.36 2452638 +156.67 -4626.56 2452638 181.03 -207.24 2452638 1971.35 -488.25 2452638 -1327.08 57.97 2452638 -156.67 -4626.56 2452638 +267.01 -3266.36 2452638 317.87 -3775.38 2452638 -10171.1 660.48 2452638 4133.98 -775.72 2452638 +4329.49 -4000.51 2452638 PREHOOK: query: -- VECTORIZATION IS ENABLED +-- SORT_QUERY_RESULTS create table ss_orc ( ss_sold_date_sk int, ss_net_paid_inc_tax float, @@ -982,6 +1015,7 @@ PREHOOK: Output: database:default PREHOOK: Output: default@ss_orc POSTHOOK: query: -- VECTORIZATION IS ENABLED +-- SORT_QUERY_RESULTS create table ss_orc ( ss_sold_date_sk int, ss_net_paid_inc_tax float, @@ -989,25 +1023,29 @@ ss_net_profit float) stored as orc POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@ss_orc -PREHOOK: query: create table ss_part_orc ( +PREHOOK: query: -- SORT_QUERY_RESULTS +create table ss_part_orc ( ss_net_paid_inc_tax float, ss_net_profit float) partitioned by (ss_sold_date_sk int) stored as orc PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@ss_part_orc -POSTHOOK: query: create table ss_part_orc ( +POSTHOOK: query: -- SORT_QUERY_RESULTS +create table ss_part_orc ( ss_net_paid_inc_tax float, ss_net_profit float) partitioned by (ss_sold_date_sk int) stored as orc POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@ss_part_orc -PREHOOK: query: insert overwrite table ss_orc select * from ss +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_orc select * from ss PREHOOK: type: QUERY PREHOOK: Input: default@ss PREHOOK: Output: default@ss_orc -POSTHOOK: query: insert overwrite table ss_orc select * from ss +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_orc select * from ss POSTHOOK: type: QUERY POSTHOOK: Input: default@ss POSTHOOK: Output: default@ss_orc @@ -1030,7 +1068,8 @@ POSTHOOK: query: drop table ss_part POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@ss_part POSTHOOK: Output: default@ss_part -PREHOOK: query: explain insert overwrite table ss_part_orc partition (ss_sold_date_sk) +PREHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table ss_part_orc partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -1041,7 +1080,8 @@ select ss_net_paid_inc_tax, ss_net_profit distribute by ss_sold_date_sk PREHOOK: type: QUERY -POSTHOOK: query: explain insert overwrite table ss_part_orc partition (ss_sold_date_sk) +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table ss_part_orc partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -1112,7 +1152,8 @@ STAGE PLANS: Stage: Stage-2 Stats-Aggr Operator -PREHOOK: query: insert overwrite table ss_part_orc partition (ss_sold_date_sk) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part_orc partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -1125,7 +1166,8 @@ select ss_net_paid_inc_tax, PREHOOK: type: QUERY PREHOOK: Input: default@ss_orc PREHOOK: Output: default@ss_part_orc -POSTHOOK: query: insert overwrite table ss_part_orc partition (ss_sold_date_sk) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part_orc partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -1184,27 +1226,29 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part_orc where ss_sold_date_sk=2452617 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part_orc where ss_sold_date_sk=2452617 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part_orc PREHOOK: Input: default@ss_part_orc@ss_sold_date_sk=2452617 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part_orc where ss_sold_date_sk=2452617 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part_orc where ss_sold_date_sk=2452617 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part_orc POSTHOOK: Input: default@ss_part_orc@ss_sold_date_sk=2452617 #### A masked pattern was here #### +10022.63 3952.8 2452617 +1765.07 -4648.8 2452617 2.1 -2026.3 2452617 2.99 -11.32 2452617 -85.8 25.61 2452617 -552.96 -1363.84 2452617 -565.92 196.48 2452617 -879.07 -2185.76 2452617 -1765.07 -4648.8 2452617 3423.95 -3164.07 2452617 5362.01 -600.28 2452617 +552.96 -1363.84 2452617 +565.92 196.48 2452617 7412.83 2071.68 2452617 -10022.63 3952.8 2452617 +85.8 25.61 2452617 +879.07 -2185.76 2452617 PREHOOK: query: desc formatted ss_part_orc partition(ss_sold_date_sk=2452638) PREHOOK: type: DESCTABLE PREHOOK: Input: default@ss_part_orc @@ -1246,30 +1290,33 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part_orc where ss_sold_date_sk=2452638 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part_orc where ss_sold_date_sk=2452638 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part_orc PREHOOK: Input: default@ss_part_orc@ss_sold_date_sk=2452638 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part_orc where ss_sold_date_sk=2452638 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part_orc where ss_sold_date_sk=2452638 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part_orc POSTHOOK: Input: default@ss_part_orc@ss_sold_date_sk=2452638 #### A masked pattern was here #### 0.15 -241.22 2452638 +10171.1 660.48 2452638 +1327.08 57.97 2452638 +1413.19 178.08 2452638 150.39 -162.12 2452638 +1524.33 494.37 2452638 156.67 -4626.56 2452638 181.03 -207.24 2452638 +1971.35 -488.25 2452638 267.01 -3266.36 2452638 317.87 -3775.38 2452638 -1327.08 57.97 2452638 -1413.19 178.08 2452638 -1524.33 494.37 2452638 -1971.35 -488.25 2452638 4133.98 -775.72 2452638 4329.49 -4000.51 2452638 -10171.1 660.48 2452638 -PREHOOK: query: explain insert overwrite table ss_part_orc partition (ss_sold_date_sk) +PREHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table ss_part_orc partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -1277,7 +1324,8 @@ select ss_net_paid_inc_tax, where ss_sold_date_sk>=2452617 and ss_sold_date_sk<=2452638 distribute by ss_sold_date_sk PREHOOK: type: QUERY -POSTHOOK: query: explain insert overwrite table ss_part_orc partition (ss_sold_date_sk) +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table ss_part_orc partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -1339,7 +1387,8 @@ STAGE PLANS: Stage: Stage-2 Stats-Aggr Operator -PREHOOK: query: insert overwrite table ss_part_orc partition (ss_sold_date_sk) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part_orc partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -1349,7 +1398,8 @@ select ss_net_paid_inc_tax, PREHOOK: type: QUERY PREHOOK: Input: default@ss_orc PREHOOK: Output: default@ss_part_orc -POSTHOOK: query: insert overwrite table ss_part_orc partition (ss_sold_date_sk) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part_orc partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -1405,27 +1455,29 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part_orc where ss_sold_date_sk=2452617 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part_orc where ss_sold_date_sk=2452617 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part_orc PREHOOK: Input: default@ss_part_orc@ss_sold_date_sk=2452617 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part_orc where ss_sold_date_sk=2452617 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part_orc where ss_sold_date_sk=2452617 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part_orc POSTHOOK: Input: default@ss_part_orc@ss_sold_date_sk=2452617 #### A masked pattern was here #### +10022.63 3952.8 2452617 +1765.07 -4648.8 2452617 +2.1 -2026.3 2452617 +2.99 -11.32 2452617 3423.95 -3164.07 2452617 5362.01 -600.28 2452617 +552.96 -1363.84 2452617 565.92 196.48 2452617 -85.8 25.61 2452617 7412.83 2071.68 2452617 +85.8 25.61 2452617 879.07 -2185.76 2452617 -1765.07 -4648.8 2452617 -552.96 -1363.84 2452617 -2.1 -2026.3 2452617 -10022.63 3952.8 2452617 -2.99 -11.32 2452617 PREHOOK: query: desc formatted ss_part_orc partition(ss_sold_date_sk=2452638) PREHOOK: type: DESCTABLE PREHOOK: Input: default@ss_part_orc @@ -1467,29 +1519,31 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part_orc where ss_sold_date_sk=2452638 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part_orc where ss_sold_date_sk=2452638 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part_orc PREHOOK: Input: default@ss_part_orc@ss_sold_date_sk=2452638 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part_orc where ss_sold_date_sk=2452638 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part_orc where ss_sold_date_sk=2452638 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part_orc POSTHOOK: Input: default@ss_part_orc@ss_sold_date_sk=2452638 #### A masked pattern was here #### -4329.49 -4000.51 2452638 +0.15 -241.22 2452638 +10171.1 660.48 2452638 +1327.08 57.97 2452638 1413.19 178.08 2452638 150.39 -162.12 2452638 1524.33 494.37 2452638 -0.15 -241.22 2452638 -267.01 -3266.36 2452638 +156.67 -4626.56 2452638 181.03 -207.24 2452638 1971.35 -488.25 2452638 -1327.08 57.97 2452638 -156.67 -4626.56 2452638 +267.01 -3266.36 2452638 317.87 -3775.38 2452638 -10171.1 660.48 2452638 4133.98 -775.72 2452638 +4329.49 -4000.51 2452638 PREHOOK: query: drop table ss_orc PREHOOK: type: DROPTABLE PREHOOK: Input: default@ss_orc @@ -1510,7 +1564,8 @@ PREHOOK: query: drop table if exists hive13_dp1 PREHOOK: type: DROPTABLE POSTHOOK: query: drop table if exists hive13_dp1 POSTHOOK: type: DROPTABLE -PREHOOK: query: create table if not exists hive13_dp1 ( +PREHOOK: query: -- SORT_QUERY_RESULTS +create table if not exists hive13_dp1 ( k1 int, k2 int ) @@ -1519,7 +1574,8 @@ STORED AS ORC PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hive13_dp1 -POSTHOOK: query: create table if not exists hive13_dp1 ( +POSTHOOK: query: -- SORT_QUERY_RESULTS +create table if not exists hive13_dp1 ( k1 int, k2 int ) @@ -1528,7 +1584,8 @@ STORED AS ORC POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hive13_dp1 -PREHOOK: query: explain insert overwrite table `hive13_dp1` partition(`day`) +PREHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table `hive13_dp1` partition(`day`) select key k1, count(value) k2, @@ -1536,7 +1593,8 @@ select from src group by "day", key PREHOOK: type: QUERY -POSTHOOK: query: explain insert overwrite table `hive13_dp1` partition(`day`) +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table `hive13_dp1` partition(`day`) select key k1, count(value) k2, @@ -1607,7 +1665,8 @@ STAGE PLANS: Stage: Stage-2 Stats-Aggr Operator -PREHOOK: query: insert overwrite table `hive13_dp1` partition(`day`) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table `hive13_dp1` partition(`day`) select key k1, count(value) k2, @@ -1617,7 +1676,8 @@ group by "day", key PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@hive13_dp1 -POSTHOOK: query: insert overwrite table `hive13_dp1` partition(`day`) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table `hive13_dp1` partition(`day`) select key k1, count(value) k2, @@ -1629,22 +1689,25 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@hive13_dp1@day=day POSTHOOK: Lineage: hive13_dp1 PARTITION(day=day).k1 EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: hive13_dp1 PARTITION(day=day).k2 EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: select * from hive13_dp1 limit 5 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from hive13_dp1 order by k1, k2 limit 5 PREHOOK: type: QUERY PREHOOK: Input: default@hive13_dp1 PREHOOK: Input: default@hive13_dp1@day=day #### A masked pattern was here #### -POSTHOOK: query: select * from hive13_dp1 limit 5 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from hive13_dp1 order by k1, k2 limit 5 POSTHOOK: type: QUERY POSTHOOK: Input: default@hive13_dp1 POSTHOOK: Input: default@hive13_dp1@day=day #### A masked pattern was here #### 0 3 day -10 1 day -100 2 day -103 2 day -104 2 day -PREHOOK: query: explain insert overwrite table `hive13_dp1` partition(`day`) +2 1 day +4 1 day +5 3 day +8 1 day +PREHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table `hive13_dp1` partition(`day`) select key k1, count(value) k2, @@ -1652,7 +1715,8 @@ select from src group by "day", key PREHOOK: type: QUERY -POSTHOOK: query: explain insert overwrite table `hive13_dp1` partition(`day`) +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table `hive13_dp1` partition(`day`) select key k1, count(value) k2, @@ -1723,7 +1787,8 @@ STAGE PLANS: Stage: Stage-2 Stats-Aggr Operator -PREHOOK: query: insert overwrite table `hive13_dp1` partition(`day`) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table `hive13_dp1` partition(`day`) select key k1, count(value) k2, @@ -1733,7 +1798,8 @@ group by "day", key PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@hive13_dp1 -POSTHOOK: query: insert overwrite table `hive13_dp1` partition(`day`) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table `hive13_dp1` partition(`day`) select key k1, count(value) k2, @@ -1745,21 +1811,23 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@hive13_dp1@day=day POSTHOOK: Lineage: hive13_dp1 PARTITION(day=day).k1 EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: hive13_dp1 PARTITION(day=day).k2 EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: select * from hive13_dp1 limit 5 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from hive13_dp1 order by k1, k2 limit 5 PREHOOK: type: QUERY PREHOOK: Input: default@hive13_dp1 PREHOOK: Input: default@hive13_dp1@day=day #### A masked pattern was here #### -POSTHOOK: query: select * from hive13_dp1 limit 5 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from hive13_dp1 order by k1, k2 limit 5 POSTHOOK: type: QUERY POSTHOOK: Input: default@hive13_dp1 POSTHOOK: Input: default@hive13_dp1@day=day #### A masked pattern was here #### 0 3 day -10 1 day -100 2 day -103 2 day -104 2 day +2 1 day +4 1 day +5 3 day +8 1 day PREHOOK: query: drop table hive13_dp1 PREHOOK: type: DROPTABLE PREHOOK: Input: default@hive13_dp1 diff --git a/ql/src/test/results/clientpositive/filter_join_breaktask2.q.out b/ql/src/test/results/clientpositive/filter_join_breaktask2.q.out index 6a2396e..8e0d0f6 100644 --- a/ql/src/test/results/clientpositive/filter_join_breaktask2.q.out +++ b/ql/src/test/results/clientpositive/filter_join_breaktask2.q.out @@ -1,42 +1,52 @@ -PREHOOK: query: create table T1(c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string) +PREHOOK: query: -- SORT_QUERY_RESULTS +create table T1(c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string) partitioned by (ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@T1 -POSTHOOK: query: create table T1(c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string) +POSTHOOK: query: -- SORT_QUERY_RESULTS +create table T1(c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 -PREHOOK: query: create table T2(c1 string, c2 string, c3 string, c0 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string) partitioned by (ds string) +PREHOOK: query: -- SORT_QUERY_RESULTS +create table T2(c1 string, c2 string, c3 string, c0 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string) partitioned by (ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@T2 -POSTHOOK: query: create table T2(c1 string, c2 string, c3 string, c0 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string) partitioned by (ds string) +POSTHOOK: query: -- SORT_QUERY_RESULTS +create table T2(c1 string, c2 string, c3 string, c0 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 -PREHOOK: query: create table T3 (c0 bigint, c1 bigint, c2 int) partitioned by (ds string) +PREHOOK: query: -- SORT_QUERY_RESULTS +create table T3 (c0 bigint, c1 bigint, c2 int) partitioned by (ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@T3 -POSTHOOK: query: create table T3 (c0 bigint, c1 bigint, c2 int) partitioned by (ds string) +POSTHOOK: query: -- SORT_QUERY_RESULTS +create table T3 (c0 bigint, c1 bigint, c2 int) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@T3 -PREHOOK: query: create table T4 (c0 bigint, c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string, c26 string, c27 string, c28 string, c29 string, c30 string, c31 string, c32 string, c33 string, c34 string, c35 string, c36 string, c37 string, c38 string, c39 string, c40 string, c41 string, c42 string, c43 string, c44 string, c45 string, c46 string, c47 string, c48 string, c49 string, c50 string, c51 string, c52 string, c53 string, c54 string, c55 string, c56 string, c57 string, c58 string, c59 string, c60 string, c61 string, c62 string, c63 string, c64 string, c65 string, c66 string, c67 bigint, c68 string, c69 string, c70 bigint, c71 bigint, c72 bigint, c73 string, c74 string, c75 string, c76 string, c77 string, c78 string, c79 string, c80 string, c81 bigint, c82 bigint, c83 bigint) partitioned by (ds string) +PREHOOK: query: -- SORT_QUERY_RESULTS +create table T4 (c0 bigint, c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string, c26 string, c27 string, c28 string, c29 string, c30 string, c31 string, c32 string, c33 string, c34 string, c35 string, c36 string, c37 string, c38 string, c39 string, c40 string, c41 string, c42 string, c43 string, c44 string, c45 string, c46 string, c47 string, c48 string, c49 string, c50 string, c51 string, c52 string, c53 string, c54 string, c55 string, c56 string, c57 string, c58 string, c59 string, c60 string, c61 string, c62 string, c63 string, c64 string, c65 string, c66 string, c67 bigint, c68 string, c69 string, c70 bigint, c71 bigint, c72 bigint, c73 string, c74 string, c75 string, c76 string, c77 string, c78 string, c79 string, c80 string, c81 bigint, c82 bigint, c83 bigint) partitioned by (ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@T4 -POSTHOOK: query: create table T4 (c0 bigint, c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string, c26 string, c27 string, c28 string, c29 string, c30 string, c31 string, c32 string, c33 string, c34 string, c35 string, c36 string, c37 string, c38 string, c39 string, c40 string, c41 string, c42 string, c43 string, c44 string, c45 string, c46 string, c47 string, c48 string, c49 string, c50 string, c51 string, c52 string, c53 string, c54 string, c55 string, c56 string, c57 string, c58 string, c59 string, c60 string, c61 string, c62 string, c63 string, c64 string, c65 string, c66 string, c67 bigint, c68 string, c69 string, c70 bigint, c71 bigint, c72 bigint, c73 string, c74 string, c75 string, c76 string, c77 string, c78 string, c79 string, c80 string, c81 bigint, c82 bigint, c83 bigint) partitioned by (ds string) +POSTHOOK: query: -- SORT_QUERY_RESULTS +create table T4 (c0 bigint, c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string, c26 string, c27 string, c28 string, c29 string, c30 string, c31 string, c32 string, c33 string, c34 string, c35 string, c36 string, c37 string, c38 string, c39 string, c40 string, c41 string, c42 string, c43 string, c44 string, c45 string, c46 string, c47 string, c48 string, c49 string, c50 string, c51 string, c52 string, c53 string, c54 string, c55 string, c56 string, c57 string, c58 string, c59 string, c60 string, c61 string, c62 string, c63 string, c64 string, c65 string, c66 string, c67 bigint, c68 string, c69 string, c70 bigint, c71 bigint, c72 bigint, c73 string, c74 string, c75 string, c76 string, c77 string, c78 string, c79 string, c80 string, c81 bigint, c82 bigint, c83 bigint) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@T4 -PREHOOK: query: insert overwrite table T1 partition (ds='2010-04-17') select '5', '1', '1', '1', 0, 0,4 from src tablesample (1 rows) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T1 partition (ds='2010-04-17') select '5', '1', '1', '1', 0, 0,4 from src tablesample (1 rows) PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@t1@ds=2010-04-17 -POSTHOOK: query: insert overwrite table T1 partition (ds='2010-04-17') select '5', '1', '1', '1', 0, 0,4 from src tablesample (1 rows) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T1 partition (ds='2010-04-17') select '5', '1', '1', '1', 0, 0,4 from src tablesample (1 rows) POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@t1@ds=2010-04-17 @@ -47,11 +57,13 @@ POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c4 SIMPLE [] POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c5 SIMPLE [] POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c6 SIMPLE [] POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c7 SIMPLE [] -PREHOOK: query: insert overwrite table T2 partition(ds='2010-04-17') select '5','name', NULL, '2', 'kavin',NULL, '9', 'c', '8', '0', '0', '7', '1','2', '0', '3','2', NULL, '1', NULL, '3','2','0','0','5','10' from src tablesample (1 rows) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T2 partition(ds='2010-04-17') select '5','name', NULL, '2', 'kavin',NULL, '9', 'c', '8', '0', '0', '7', '1','2', '0', '3','2', NULL, '1', NULL, '3','2','0','0','5','10' from src tablesample (1 rows) PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@t2@ds=2010-04-17 -POSTHOOK: query: insert overwrite table T2 partition(ds='2010-04-17') select '5','name', NULL, '2', 'kavin',NULL, '9', 'c', '8', '0', '0', '7', '1','2', '0', '3','2', NULL, '1', NULL, '3','2','0','0','5','10' from src tablesample (1 rows) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T2 partition(ds='2010-04-17') select '5','name', NULL, '2', 'kavin',NULL, '9', 'c', '8', '0', '0', '7', '1','2', '0', '3','2', NULL, '1', NULL, '3','2','0','0','5','10' from src tablesample (1 rows) POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@t2@ds=2010-04-17 @@ -81,23 +93,27 @@ POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c6 SIMPLE [] POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c7 SIMPLE [] POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c8 SIMPLE [] POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c9 SIMPLE [] -PREHOOK: query: insert overwrite table T3 partition (ds='2010-04-17') select 4,5,0 from src tablesample (1 rows) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T3 partition (ds='2010-04-17') select 4,5,0 from src tablesample (1 rows) PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@t3@ds=2010-04-17 -POSTHOOK: query: insert overwrite table T3 partition (ds='2010-04-17') select 4,5,0 from src tablesample (1 rows) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T3 partition (ds='2010-04-17') select 4,5,0 from src tablesample (1 rows) POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@t3@ds=2010-04-17 POSTHOOK: Lineage: t3 PARTITION(ds=2010-04-17).c0 EXPRESSION [] POSTHOOK: Lineage: t3 PARTITION(ds=2010-04-17).c1 EXPRESSION [] POSTHOOK: Lineage: t3 PARTITION(ds=2010-04-17).c2 SIMPLE [] -PREHOOK: query: insert overwrite table T4 partition(ds='2010-04-17') +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T4 partition(ds='2010-04-17') select 4,'1','1','8','4','5','1','0','9','U','2','2', '0','2','1','1','J','C','A','U', '2','s', '2',NULL, NULL, NULL,NULL, NULL, NULL,'1','j', 'S', '6',NULL,'1', '2', 'J', 'g', '1', 'e', '2', '1', '2', 'U', 'P', 'p', '3', '0', '0', '0', '1', '1', '1', '0', '0', '0', '6', '2', 'j',NULL, NULL, NULL,NULL,NULL, NULL, '5',NULL, 'j', 'j', 2, 2, 1, '2', '2', '1', '1', '1', '1', '1', '1', 1, 1, 32,NULL from src limit 1 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@t4@ds=2010-04-17 -POSTHOOK: query: insert overwrite table T4 partition(ds='2010-04-17') +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T4 partition(ds='2010-04-17') select 4,'1','1','8','4','5','1','0','9','U','2','2', '0','2','1','1','J','C','A','U', '2','s', '2',NULL, NULL, NULL,NULL, NULL, NULL,'1','j', 'S', '6',NULL,'1', '2', 'J', 'g', '1', 'e', '2', '1', '2', 'U', 'P', 'p', '3', '0', '0', '0', '1', '1', '1', '0', '0', '0', '6', '2', 'j',NULL, NULL, NULL,NULL,NULL, NULL, '5',NULL, 'j', 'j', 2, 2, 1, '2', '2', '1', '1', '1', '1', '1', '1', 1, 1, 32,NULL from src limit 1 POSTHOOK: type: QUERY POSTHOOK: Input: default@src @@ -186,52 +202,61 @@ POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c81 EXPRESSION [] POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c82 EXPRESSION [] POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c83 EXPRESSION [] POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c9 SIMPLE [] -PREHOOK: query: select * from T2 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from T2 PREHOOK: type: QUERY PREHOOK: Input: default@t2 PREHOOK: Input: default@t2@ds=2010-04-17 #### A masked pattern was here #### -POSTHOOK: query: select * from T2 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from T2 POSTHOOK: type: QUERY POSTHOOK: Input: default@t2 POSTHOOK: Input: default@t2@ds=2010-04-17 #### A masked pattern was here #### 5 name NULL 2 kavin NULL 9 c 8 0 0 7 1 2 0 3 2 NULL 1 NULL 3 2 0 0 5 10 2010-04-17 -PREHOOK: query: select * from T1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from T1 PREHOOK: type: QUERY PREHOOK: Input: default@t1 PREHOOK: Input: default@t1@ds=2010-04-17 #### A masked pattern was here #### -POSTHOOK: query: select * from T1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from T1 POSTHOOK: type: QUERY POSTHOOK: Input: default@t1 POSTHOOK: Input: default@t1@ds=2010-04-17 #### A masked pattern was here #### 5 1 1 1 0 0 4 2010-04-17 -PREHOOK: query: select * from T3 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from T3 PREHOOK: type: QUERY PREHOOK: Input: default@t3 PREHOOK: Input: default@t3@ds=2010-04-17 #### A masked pattern was here #### -POSTHOOK: query: select * from T3 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from T3 POSTHOOK: type: QUERY POSTHOOK: Input: default@t3 POSTHOOK: Input: default@t3@ds=2010-04-17 #### A masked pattern was here #### 4 5 0 2010-04-17 -PREHOOK: query: select * from T4 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from T4 PREHOOK: type: QUERY PREHOOK: Input: default@t4 PREHOOK: Input: default@t4@ds=2010-04-17 #### A masked pattern was here #### -POSTHOOK: query: select * from T4 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from T4 POSTHOOK: type: QUERY POSTHOOK: Input: default@t4 POSTHOOK: Input: default@t4@ds=2010-04-17 #### A masked pattern was here #### 4 1 1 8 4 5 1 0 9 U 2 2 0 2 1 1 J C A U 2 s 2 NULL NULL NULL NULL NULL NULL 1 j S 6 NULL 1 2 J g 1 e 2 1 2 U P p 3 0 0 0 1 1 1 0 0 0 6 2 j NULL NULL NULL NULL NULL NULL 5 NULL NULL j 2 2 1 2 2 1 1 1 1 1 1 1 1 32 NULL 2010-04-17 WARNING: Comparing a bigint and a string may result in a loss of precision. -PREHOOK: query: SELECT a.c1 as a_c1, b.c1 b_c1, d.c0 as d_c0 +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT a.c1 as a_c1, b.c1 b_c1, d.c0 as d_c0 FROM T1 a JOIN T2 b ON (a.c1 = b.c1 AND a.ds='2010-04-17' AND b.ds='2010-04-17') JOIN T3 c @@ -248,7 +273,8 @@ PREHOOK: Input: default@t3@ds=2010-04-17 PREHOOK: Input: default@t4 PREHOOK: Input: default@t4@ds=2010-04-17 #### A masked pattern was here #### -POSTHOOK: query: SELECT a.c1 as a_c1, b.c1 b_c1, d.c0 as d_c0 +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT a.c1 as a_c1, b.c1 b_c1, d.c0 as d_c0 FROM T1 a JOIN T2 b ON (a.c1 = b.c1 AND a.ds='2010-04-17' AND b.ds='2010-04-17') JOIN T3 c diff --git a/ql/src/test/results/clientpositive/insert_into1.q.out b/ql/src/test/results/clientpositive/insert_into1.q.out index 9e5f3bb..b040535 100644 --- a/ql/src/test/results/clientpositive/insert_into1.q.out +++ b/ql/src/test/results/clientpositive/insert_into1.q.out @@ -10,9 +10,11 @@ POSTHOOK: query: CREATE TABLE insert_into1 (key int, value string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@insert_into1 -PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * from src LIMIT 100 +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN INSERT INTO TABLE insert_into1 SELECT * from src ORDER BY key LIMIT 100 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * from src LIMIT 100 +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN INSERT INTO TABLE insert_into1 SELECT * from src ORDER BY key LIMIT 100 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -30,18 +32,16 @@ STAGE PLANS: expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE - Limit - Number of rows: 100 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - sort order: - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: string), _col1 (type: string) + Reduce Output Operator + key expressions: _col0 (type: string) + sort order: + + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: string) Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: string), VALUE._col1 (type: string) + expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 100 Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE @@ -71,11 +71,11 @@ STAGE PLANS: Stage: Stage-2 Stats-Aggr Operator -PREHOOK: query: INSERT INTO TABLE insert_into1 SELECT * from src LIMIT 100 +PREHOOK: query: INSERT INTO TABLE insert_into1 SELECT * from src ORDER BY key LIMIT 100 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@insert_into1 -POSTHOOK: query: INSERT INTO TABLE insert_into1 SELECT * from src LIMIT 100 +POSTHOOK: query: INSERT INTO TABLE insert_into1 SELECT * from src ORDER BY key LIMIT 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@insert_into1 @@ -93,7 +93,7 @@ POSTHOOK: query: SELECT SUM(HASH(c)) FROM ( POSTHOOK: type: QUERY POSTHOOK: Input: default@insert_into1 #### A masked pattern was here #### -10226524244 +-1142373758 PREHOOK: query: explain select count(*) from insert_into1 PREHOOK: type: QUERY @@ -119,9 +119,9 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@insert_into1 #### A masked pattern was here #### 100 -PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src LIMIT 100 +PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 100 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src LIMIT 100 +POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 100 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -139,18 +139,16 @@ STAGE PLANS: expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE - Limit - Number of rows: 100 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - sort order: - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: string), _col1 (type: string) + Reduce Output Operator + key expressions: _col0 (type: string) + sort order: + + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: string) Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: string), VALUE._col1 (type: string) + expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 100 Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE @@ -180,11 +178,11 @@ STAGE PLANS: Stage: Stage-2 Stats-Aggr Operator -PREHOOK: query: INSERT INTO TABLE insert_into1 SELECT * FROM src LIMIT 100 +PREHOOK: query: INSERT INTO TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 100 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@insert_into1 -POSTHOOK: query: INSERT INTO TABLE insert_into1 SELECT * FROM src LIMIT 100 +POSTHOOK: query: INSERT INTO TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@insert_into1 @@ -202,7 +200,7 @@ POSTHOOK: query: SELECT SUM(HASH(c)) FROM ( POSTHOOK: type: QUERY POSTHOOK: Input: default@insert_into1 #### A masked pattern was here #### -20453048488 +-2284747516 PREHOOK: query: explain SELECT COUNT(*) FROM insert_into1 PREHOOK: type: QUERY @@ -228,9 +226,9 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@insert_into1 #### A masked pattern was here #### 200 -PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src LIMIT 10 +PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 10 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src LIMIT 10 +POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 10 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -248,18 +246,16 @@ STAGE PLANS: expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE - Limit - Number of rows: 10 - Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - sort order: - Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: string), _col1 (type: string) + Reduce Output Operator + key expressions: _col0 (type: string) + sort order: + + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: string) Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: string), VALUE._col1 (type: string) + expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 10 Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE Column stats: NONE @@ -289,11 +285,11 @@ STAGE PLANS: Stage: Stage-2 Stats-Aggr Operator -PREHOOK: query: INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src LIMIT 10 +PREHOOK: query: INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 10 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@insert_into1 -POSTHOOK: query: INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src LIMIT 10 +POSTHOOK: query: INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 10 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@insert_into1 @@ -311,7 +307,7 @@ POSTHOOK: query: SELECT SUM(HASH(c)) FROM ( POSTHOOK: type: QUERY POSTHOOK: Input: default@insert_into1 #### A masked pattern was here #### --826625916 +-2693537120 PREHOOK: query: explain SELECT COUNT(*) FROM insert_into1 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/insert_into2.q.out b/ql/src/test/results/clientpositive/insert_into2.q.out index acbedb5..cc7e135 100644 --- a/ql/src/test/results/clientpositive/insert_into2.q.out +++ b/ql/src/test/results/clientpositive/insert_into2.q.out @@ -13,10 +13,10 @@ POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@insert_into2 PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into2 PARTITION (ds='1') - SELECT * FROM src LIMIT 100 + SELECT * FROM src order by key LIMIT 100 PREHOOK: type: QUERY POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into2 PARTITION (ds='1') - SELECT * FROM src LIMIT 100 + SELECT * FROM src order by key LIMIT 100 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -34,18 +34,16 @@ STAGE PLANS: expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE - Limit - Number of rows: 100 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - sort order: - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: string), _col1 (type: string) + Reduce Output Operator + key expressions: _col0 (type: string) + sort order: + + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: string) Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: string), VALUE._col1 (type: string) + expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 100 Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE @@ -77,11 +75,11 @@ STAGE PLANS: Stage: Stage-2 Stats-Aggr Operator -PREHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src limit 100 +PREHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src order by key limit 100 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@insert_into2@ds=1 -POSTHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src limit 100 +POSTHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src order by key limit 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@insert_into2@ds=1 @@ -112,11 +110,11 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@insert_into2 #### A masked pattern was here #### 100 -PREHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src limit 100 +PREHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src order by key limit 100 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@insert_into2@ds=1 -POSTHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src limit 100 +POSTHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src order by key limit 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@insert_into2@ds=1 @@ -161,12 +159,12 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@insert_into2 POSTHOOK: Input: default@insert_into2@ds=1 #### A masked pattern was here #### --24159954504 +-39568181484 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 100 + SELECT * FROM src order by key LIMIT 100 PREHOOK: type: QUERY POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 100 + SELECT * FROM src order by key LIMIT 100 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -184,18 +182,16 @@ STAGE PLANS: expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE - Limit - Number of rows: 100 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - sort order: - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: string), _col1 (type: string) + Reduce Output Operator + key expressions: _col0 (type: string) + sort order: + + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: string) Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: string), VALUE._col1 (type: string) + expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 100 Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE @@ -228,12 +224,12 @@ STAGE PLANS: Stats-Aggr Operator PREHOOK: query: INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 100 + SELECT * FROM src order by key LIMIT 100 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@insert_into2@ds=2 POSTHOOK: query: INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 100 + SELECT * FROM src order by key LIMIT 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@insert_into2@ds=2 @@ -255,7 +251,7 @@ POSTHOOK: Input: default@insert_into2 POSTHOOK: Input: default@insert_into2@ds=1 POSTHOOK: Input: default@insert_into2@ds=2 #### A masked pattern was here #### --36239931656 +-59352272126 PREHOOK: query: explain SELECT COUNT(*) FROM insert_into2 WHERE ds='2' PREHOOK: type: QUERY @@ -282,10 +278,10 @@ POSTHOOK: Input: default@insert_into2 #### A masked pattern was here #### 100 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 50 + SELECT * FROM src order by key LIMIT 50 PREHOOK: type: QUERY POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 50 + SELECT * FROM src order by key LIMIT 50 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -303,18 +299,16 @@ STAGE PLANS: expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE - Limit - Number of rows: 50 - Statistics: Num rows: 50 Data size: 500 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - sort order: - Statistics: Num rows: 50 Data size: 500 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: string), _col1 (type: string) + Reduce Output Operator + key expressions: _col0 (type: string) + sort order: + + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: string) Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: string), VALUE._col1 (type: string) + expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 50 Data size: 500 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 50 Statistics: Num rows: 50 Data size: 500 Basic stats: COMPLETE Column stats: NONE @@ -347,12 +341,12 @@ STAGE PLANS: Stats-Aggr Operator PREHOOK: query: INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 50 + SELECT * FROM src order by key LIMIT 50 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@insert_into2@ds=2 POSTHOOK: query: INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 50 + SELECT * FROM src order by key LIMIT 50 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@insert_into2@ds=2 @@ -374,7 +368,7 @@ POSTHOOK: Input: default@insert_into2 POSTHOOK: Input: default@insert_into2@ds=1 POSTHOOK: Input: default@insert_into2@ds=2 #### A masked pattern was here #### --27100860056 +-33609711132 PREHOOK: query: explain SELECT COUNT(*) FROM insert_into2 WHERE ds='2' PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/join_nullsafe.q.out b/ql/src/test/results/clientpositive/join_nullsafe.q.out index 9bdfcbd..5e1dbe7 100644 --- a/ql/src/test/results/clientpositive/join_nullsafe.q.out +++ b/ql/src/test/results/clientpositive/join_nullsafe.q.out @@ -19,9 +19,11 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@myinput1 PREHOOK: query: -- merging +-- SORT_QUERY_RESULTS explain select * from myinput1 a join myinput1 b on a.key<=>b.value PREHOOK: type: QUERY POSTHOOK: query: -- merging +-- SORT_QUERY_RESULTS explain select * from myinput1 a join myinput1 b on a.key<=>b.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -78,11 +80,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value PREHOOK: type: QUERY PREHOOK: Input: default@myinput1 #### A masked pattern was here #### -POSTHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@myinput1 #### A masked pattern was here #### @@ -97,9 +101,11 @@ NULL 35 NULL NULL NULL NULL 10 NULL NULL NULL 48 NULL NULL NULL NULL NULL -PREHOOK: query: explain select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key=c.key +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key=c.key PREHOOK: type: QUERY -POSTHOOK: query: explain select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key=c.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key=c.key POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -174,19 +180,23 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key=c.key +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key=c.key PREHOOK: type: QUERY PREHOOK: Input: default@myinput1 #### A masked pattern was here #### -POSTHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key=c.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key=c.key POSTHOOK: type: QUERY POSTHOOK: Input: default@myinput1 #### A masked pattern was here #### 10 NULL NULL 10 10 NULL 100 100 100 100 100 100 -PREHOOK: query: explain select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key<=>c.key +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key<=>c.key PREHOOK: type: QUERY -POSTHOOK: query: explain select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key<=>c.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key<=>c.key POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -253,11 +263,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key<=>c.key +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key<=>c.key PREHOOK: type: QUERY PREHOOK: Input: default@myinput1 #### A masked pattern was here #### -POSTHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key<=>c.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key<=>c.key POSTHOOK: type: QUERY POSTHOOK: Input: default@myinput1 #### A masked pattern was here #### @@ -290,9 +302,11 @@ NULL NULL 48 NULL NULL NULL NULL NULL NULL NULL NULL 10 NULL NULL NULL NULL NULL 35 NULL NULL NULL NULL NULL NULL -PREHOOK: query: explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value=b.key join myinput1 c on a.key<=>c.key AND a.value=c.value +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value=b.key join myinput1 c on a.key<=>c.key AND a.value=c.value PREHOOK: type: QUERY -POSTHOOK: query: explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value=b.key join myinput1 c on a.key<=>c.key AND a.value=c.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value=b.key join myinput1 c on a.key<=>c.key AND a.value=c.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -365,19 +379,23 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value=b.key join myinput1 c on a.key<=>c.key AND a.value=c.value +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value=b.key join myinput1 c on a.key<=>c.key AND a.value=c.value PREHOOK: type: QUERY PREHOOK: Input: default@myinput1 #### A masked pattern was here #### -POSTHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value=b.key join myinput1 c on a.key<=>c.key AND a.value=c.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value=b.key join myinput1 c on a.key<=>c.key AND a.value=c.value POSTHOOK: type: QUERY POSTHOOK: Input: default@myinput1 #### A masked pattern was here #### 100 100 100 100 100 100 NULL 10 10 NULL NULL 10 -PREHOOK: query: explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value<=>b.key join myinput1 c on a.key<=>c.key AND a.value<=>c.value +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value<=>b.key join myinput1 c on a.key<=>c.key AND a.value<=>c.value PREHOOK: type: QUERY -POSTHOOK: query: explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value<=>b.key join myinput1 c on a.key<=>c.key AND a.value<=>c.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value<=>b.key join myinput1 c on a.key<=>c.key AND a.value<=>c.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -441,11 +459,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value<=>b.key join myinput1 c on a.key<=>c.key AND a.value<=>c.value +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value<=>b.key join myinput1 c on a.key<=>c.key AND a.value<=>c.value PREHOOK: type: QUERY PREHOOK: Input: default@myinput1 #### A masked pattern was here #### -POSTHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value<=>b.key join myinput1 c on a.key<=>c.key AND a.value<=>c.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value<=>b.key join myinput1 c on a.key<=>c.key AND a.value<=>c.value POSTHOOK: type: QUERY POSTHOOK: Input: default@myinput1 #### A masked pattern was here #### @@ -454,11 +474,13 @@ POSTHOOK: Input: default@myinput1 NULL 10 10 NULL NULL 10 NULL NULL NULL NULL NULL NULL PREHOOK: query: -- outer joins +-- SORT_QUERY_RESULTS SELECT * FROM myinput1 a LEFT OUTER JOIN myinput1 b ON a.key<=>b.value PREHOOK: type: QUERY PREHOOK: Input: default@myinput1 #### A masked pattern was here #### POSTHOOK: query: -- outer joins +-- SORT_QUERY_RESULTS SELECT * FROM myinput1 a LEFT OUTER JOIN myinput1 b ON a.key<=>b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@myinput1 @@ -475,11 +497,13 @@ NULL 35 NULL NULL NULL NULL 10 NULL NULL NULL 48 NULL NULL NULL NULL NULL -PREHOOK: query: SELECT * FROM myinput1 a RIGHT OUTER JOIN myinput1 b ON a.key<=>b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM myinput1 a RIGHT OUTER JOIN myinput1 b ON a.key<=>b.value PREHOOK: type: QUERY PREHOOK: Input: default@myinput1 #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM myinput1 a RIGHT OUTER JOIN myinput1 b ON a.key<=>b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM myinput1 a RIGHT OUTER JOIN myinput1 b ON a.key<=>b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@myinput1 #### A masked pattern was here #### @@ -495,11 +519,13 @@ NULL NULL 10 NULL NULL NULL 48 NULL NULL NULL NULL 35 NULL NULL NULL NULL -PREHOOK: query: SELECT * FROM myinput1 a FULL OUTER JOIN myinput1 b ON a.key<=>b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM myinput1 a FULL OUTER JOIN myinput1 b ON a.key<=>b.value PREHOOK: type: QUERY PREHOOK: Input: default@myinput1 #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM myinput1 a FULL OUTER JOIN myinput1 b ON a.key<=>b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM myinput1 a FULL OUTER JOIN myinput1 b ON a.key<=>b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@myinput1 #### A masked pattern was here #### @@ -517,11 +543,13 @@ NULL NULL 48 NULL NULL NULL NULL 35 NULL NULL NULL NULL PREHOOK: query: -- map joins +-- SORT_QUERY_RESULTS SELECT /*+ MAPJOIN(a) */ * FROM myinput1 a JOIN myinput1 b ON a.key<=>b.value PREHOOK: type: QUERY PREHOOK: Input: default@myinput1 #### A masked pattern was here #### POSTHOOK: query: -- map joins +-- SORT_QUERY_RESULTS SELECT /*+ MAPJOIN(a) */ * FROM myinput1 a JOIN myinput1 b ON a.key<=>b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@myinput1 @@ -537,11 +565,13 @@ NULL 35 NULL NULL NULL NULL 10 NULL NULL NULL 48 NULL NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM myinput1 a JOIN myinput1 b ON a.key<=>b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM myinput1 a JOIN myinput1 b ON a.key<=>b.value PREHOOK: type: QUERY PREHOOK: Input: default@myinput1 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM myinput1 a JOIN myinput1 b ON a.key<=>b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM myinput1 a JOIN myinput1 b ON a.key<=>b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@myinput1 #### A masked pattern was here #### @@ -616,11 +646,13 @@ POSTHOOK: Lineage: smb_input1.key SIMPLE [(smb_input)smb_input.FieldSchema(name: POSTHOOK: Lineage: smb_input1.value SIMPLE [(smb_input)smb_input.FieldSchema(name:value, type:int, comment:null), ] POSTHOOK: Lineage: smb_input2.key SIMPLE [(smb_input)smb_input.FieldSchema(name:key, type:int, comment:null), ] POSTHOOK: Lineage: smb_input2.value SIMPLE [(smb_input)smb_input.FieldSchema(name:value, type:int, comment:null), ] -PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key PREHOOK: type: QUERY PREHOOK: Input: default@smb_input1 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input1 #### A masked pattern was here #### @@ -678,11 +710,13 @@ NULL 35 NULL NULL NULL NULL NULL 10050 NULL NULL NULL 35 NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key AND a.value <=> b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key AND a.value <=> b.value PREHOOK: type: QUERY PREHOOK: Input: default@smb_input1 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key AND a.value <=> b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key AND a.value <=> b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input1 #### A masked pattern was here #### @@ -728,11 +762,13 @@ POSTHOOK: Input: default@smb_input1 NULL 10050 NULL 10050 NULL 35 NULL 35 NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a RIGHT OUTER JOIN smb_input1 b ON a.key <=> b.key +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a RIGHT OUTER JOIN smb_input1 b ON a.key <=> b.key PREHOOK: type: QUERY PREHOOK: Input: default@smb_input1 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a RIGHT OUTER JOIN smb_input1 b ON a.key <=> b.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a RIGHT OUTER JOIN smb_input1 b ON a.key <=> b.key POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input1 #### A masked pattern was here #### @@ -790,11 +826,13 @@ NULL 35 NULL NULL NULL NULL NULL 10050 NULL NULL NULL 35 NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key PREHOOK: type: QUERY PREHOOK: Input: default@smb_input1 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input1 #### A masked pattern was here #### @@ -852,11 +890,13 @@ NULL 35 NULL NULL NULL NULL NULL 10050 NULL NULL NULL 35 NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a LEFT OUTER JOIN smb_input1 b ON a.key <=> b.key +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a LEFT OUTER JOIN smb_input1 b ON a.key <=> b.key PREHOOK: type: QUERY PREHOOK: Input: default@smb_input1 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a LEFT OUTER JOIN smb_input1 b ON a.key <=> b.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a LEFT OUTER JOIN smb_input1 b ON a.key <=> b.key POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input1 #### A masked pattern was here #### @@ -914,12 +954,14 @@ NULL 35 NULL NULL NULL NULL NULL 10050 NULL NULL NULL 35 NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input2 b ON a.key <=> b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input2 b ON a.key <=> b.value PREHOOK: type: QUERY PREHOOK: Input: default@smb_input1 PREHOOK: Input: default@smb_input2 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input2 b ON a.key <=> b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input2 b ON a.key <=> b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input1 POSTHOOK: Input: default@smb_input2 @@ -935,12 +977,14 @@ NULL 35 12 NULL NULL 35 NULL NULL NULL NULL 12 NULL NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a JOIN smb_input2 b ON a.key <=> b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a JOIN smb_input2 b ON a.key <=> b.value PREHOOK: type: QUERY PREHOOK: Input: default@smb_input1 PREHOOK: Input: default@smb_input2 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a JOIN smb_input2 b ON a.key <=> b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a JOIN smb_input2 b ON a.key <=> b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input1 POSTHOOK: Input: default@smb_input2 @@ -956,12 +1000,14 @@ NULL 35 12 NULL NULL 35 NULL NULL NULL NULL 12 NULL NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a LEFT OUTER JOIN smb_input2 b ON a.key <=> b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a LEFT OUTER JOIN smb_input2 b ON a.key <=> b.value PREHOOK: type: QUERY PREHOOK: Input: default@smb_input1 PREHOOK: Input: default@smb_input2 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a LEFT OUTER JOIN smb_input2 b ON a.key <=> b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a LEFT OUTER JOIN smb_input2 b ON a.key <=> b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input1 POSTHOOK: Input: default@smb_input2 @@ -998,12 +1044,14 @@ NULL 35 12 NULL NULL 35 NULL NULL NULL NULL 12 NULL NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a RIGHT OUTER JOIN smb_input2 b ON a.key <=> b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a RIGHT OUTER JOIN smb_input2 b ON a.key <=> b.value PREHOOK: type: QUERY PREHOOK: Input: default@smb_input1 PREHOOK: Input: default@smb_input2 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a RIGHT OUTER JOIN smb_input2 b ON a.key <=> b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a RIGHT OUTER JOIN smb_input2 b ON a.key <=> b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input1 POSTHOOK: Input: default@smb_input2 @@ -1038,11 +1086,13 @@ NULL NULL 80 10040 NULL NULL 80 10040 NULL NULL NULL 10050 NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input2 a JOIN smb_input2 b ON a.value <=> b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input2 a JOIN smb_input2 b ON a.value <=> b.value PREHOOK: type: QUERY PREHOOK: Input: default@smb_input2 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input2 a JOIN smb_input2 b ON a.value <=> b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input2 a JOIN smb_input2 b ON a.value <=> b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input2 #### A masked pattern was here #### @@ -1154,11 +1204,13 @@ NULL 10050 NULL 10050 NULL 35 NULL 35 NULL NULL 12 NULL NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input2 a RIGHT OUTER JOIN smb_input2 b ON a.value <=> b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input2 a RIGHT OUTER JOIN smb_input2 b ON a.value <=> b.value PREHOOK: type: QUERY PREHOOK: Input: default@smb_input2 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input2 a RIGHT OUTER JOIN smb_input2 b ON a.value <=> b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input2 a RIGHT OUTER JOIN smb_input2 b ON a.value <=> b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input2 #### A masked pattern was here #### @@ -1270,11 +1322,13 @@ NULL 10050 NULL 10050 NULL 35 NULL 35 NULL NULL 12 NULL NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input2 a JOIN smb_input2 b ON a.value <=> b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input2 a JOIN smb_input2 b ON a.value <=> b.value PREHOOK: type: QUERY PREHOOK: Input: default@smb_input2 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input2 a JOIN smb_input2 b ON a.value <=> b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input2 a JOIN smb_input2 b ON a.value <=> b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input2 #### A masked pattern was here #### @@ -1386,11 +1440,13 @@ NULL 10050 NULL 10050 NULL 35 NULL 35 NULL NULL 12 NULL NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input2 a LEFT OUTER JOIN smb_input2 b ON a.value <=> b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input2 a LEFT OUTER JOIN smb_input2 b ON a.value <=> b.value PREHOOK: type: QUERY PREHOOK: Input: default@smb_input2 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input2 a LEFT OUTER JOIN smb_input2 b ON a.value <=> b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input2 a LEFT OUTER JOIN smb_input2 b ON a.value <=> b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input2 #### A masked pattern was here #### @@ -1503,9 +1559,11 @@ NULL 35 NULL 35 NULL NULL 12 NULL NULL NULL NULL NULL PREHOOK: query: --HIVE-3315 join predicate transitive +-- SORT_QUERY_RESULTS explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.key is NULL PREHOOK: type: QUERY POSTHOOK: query: --HIVE-3315 join predicate transitive +-- SORT_QUERY_RESULTS explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.key is NULL POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -1568,11 +1626,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.key is NULL +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.key is NULL PREHOOK: type: QUERY PREHOOK: Input: default@myinput1 #### A masked pattern was here #### -POSTHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.key is NULL +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.key is NULL POSTHOOK: type: QUERY POSTHOOK: Input: default@myinput1 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out b/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out index 3fba77c..fa7c2fd 100644 --- a/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out @@ -455,10 +455,12 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -557,10 +559,12 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -702,7 +706,8 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' +PREHOOK: query: -- SORT_QUERY_RESULTS +select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@src1 @@ -712,7 +717,8 @@ PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### -POSTHOOK: query: select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' +POSTHOOK: query: -- SORT_QUERY_RESULTS +select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@src1 @@ -742,7 +748,8 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 98 98 98 -PREHOOK: query: select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds +PREHOOK: query: -- SORT_QUERY_RESULTS +select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@srcpart @@ -751,7 +758,8 @@ PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### -POSTHOOK: query: select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds +POSTHOOK: query: -- SORT_QUERY_RESULTS +select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@srcpart @@ -762,7 +770,8 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### 5308 5308 -PREHOOK: query: select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' +PREHOOK: query: -- SORT_QUERY_RESULTS +select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@src1 @@ -772,7 +781,8 @@ PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### -POSTHOOK: query: select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' +POSTHOOK: query: -- SORT_QUERY_RESULTS +select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@src1 @@ -802,7 +812,8 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 98 98 98 -PREHOOK: query: select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds +PREHOOK: query: -- SORT_QUERY_RESULTS +select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@srcpart @@ -811,7 +822,8 @@ PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### -POSTHOOK: query: select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds +POSTHOOK: query: -- SORT_QUERY_RESULTS +select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@srcpart diff --git a/ql/src/test/results/clientpositive/mergejoin.q.out b/ql/src/test/results/clientpositive/mergejoin.q.out index af3d7df..7a93a55 100644 --- a/ql/src/test/results/clientpositive/mergejoin.q.out +++ b/ql/src/test/results/clientpositive/mergejoin.q.out @@ -1,7 +1,9 @@ -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from src a join src1 b on a.key = b.key PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from src a join src1 b on a.key = b.key POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -69,12 +71,14 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select * from src a join src1 b on a.key = b.key +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from src a join src1 b on a.key = b.key PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@src1 #### A masked pattern was here #### -POSTHOOK: query: select * from src a join src1 b on a.key = b.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from src a join src1 b on a.key = b.key POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@src1 @@ -226,11 +230,13 @@ POSTHOOK: Input: default@srcbucket_mapjoin@ds=2008-04-08 POSTHOOK: Output: default@tab@ds=2008-04-08 POSTHOOK: Lineage: tab PARTITION(ds=2008-04-08).key SIMPLE [(srcbucket_mapjoin)srcbucket_mapjoin.FieldSchema(name:key, type:int, comment:null), ] POSTHOOK: Lineage: tab PARTITION(ds=2008-04-08).value SIMPLE [(srcbucket_mapjoin)srcbucket_mapjoin.FieldSchema(name:value, type:string, comment:null), ] -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select count(*) from tab a join tab_part b on a.key = b.key PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select count(*) from tab a join tab_part b on a.key = b.key POSTHOOK: type: QUERY @@ -315,14 +321,16 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select * from tab a join tab_part b on a.key = b.key +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from tab a join tab_part b on a.key = b.key PREHOOK: type: QUERY PREHOOK: Input: default@tab PREHOOK: Input: default@tab@ds=2008-04-08 PREHOOK: Input: default@tab_part PREHOOK: Input: default@tab_part@ds=2008-04-08 #### A masked pattern was here #### -POSTHOOK: query: select * from tab a join tab_part b on a.key = b.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from tab a join tab_part b on a.key = b.key POSTHOOK: type: QUERY POSTHOOK: Input: default@tab POSTHOOK: Input: default@tab@ds=2008-04-08 @@ -338,74 +346,12 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 0 val_0 2008-04-08 0 val_0 2008-04-08 0 val_0 2008-04-08 0 val_0 2008-04-08 0 val_0 2008-04-08 0 val_0 2008-04-08 -2 val_2 2008-04-08 2 val_2 2008-04-08 -4 val_4 2008-04-08 4 val_4 2008-04-08 -8 val_8 2008-04-08 8 val_8 2008-04-08 -11 val_11 2008-04-08 11 val_11 2008-04-08 -15 val_15 2008-04-08 15 val_15 2008-04-08 -15 val_15 2008-04-08 15 val_15 2008-04-08 -15 val_15 2008-04-08 15 val_15 2008-04-08 -15 val_15 2008-04-08 15 val_15 2008-04-08 -17 val_17 2008-04-08 17 val_17 2008-04-08 -19 val_19 2008-04-08 19 val_19 2008-04-08 -20 val_20 2008-04-08 20 val_20 2008-04-08 -24 val_24 2008-04-08 24 val_24 2008-04-08 -24 val_24 2008-04-08 24 val_24 2008-04-08 -24 val_24 2008-04-08 24 val_24 2008-04-08 -24 val_24 2008-04-08 24 val_24 2008-04-08 -26 val_26 2008-04-08 26 val_26 2008-04-08 -26 val_26 2008-04-08 26 val_26 2008-04-08 -26 val_26 2008-04-08 26 val_26 2008-04-08 -26 val_26 2008-04-08 26 val_26 2008-04-08 -28 val_28 2008-04-08 28 val_28 2008-04-08 -33 val_33 2008-04-08 33 val_33 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -37 val_37 2008-04-08 37 val_37 2008-04-08 -37 val_37 2008-04-08 37 val_37 2008-04-08 -37 val_37 2008-04-08 37 val_37 2008-04-08 -37 val_37 2008-04-08 37 val_37 2008-04-08 -42 val_42 2008-04-08 42 val_42 2008-04-08 -42 val_42 2008-04-08 42 val_42 2008-04-08 -42 val_42 2008-04-08 42 val_42 2008-04-08 -42 val_42 2008-04-08 42 val_42 2008-04-08 -44 val_44 2008-04-08 44 val_44 2008-04-08 -51 val_51 2008-04-08 51 val_51 2008-04-08 -51 val_51 2008-04-08 51 val_51 2008-04-08 -51 val_51 2008-04-08 51 val_51 2008-04-08 -51 val_51 2008-04-08 51 val_51 2008-04-08 -53 val_53 2008-04-08 53 val_53 2008-04-08 -57 val_57 2008-04-08 57 val_57 2008-04-08 -64 val_64 2008-04-08 64 val_64 2008-04-08 -66 val_66 2008-04-08 66 val_66 2008-04-08 -77 val_77 2008-04-08 77 val_77 2008-04-08 -80 val_80 2008-04-08 80 val_80 2008-04-08 -82 val_82 2008-04-08 82 val_82 2008-04-08 -84 val_84 2008-04-08 84 val_84 2008-04-08 -84 val_84 2008-04-08 84 val_84 2008-04-08 -84 val_84 2008-04-08 84 val_84 2008-04-08 -84 val_84 2008-04-08 84 val_84 2008-04-08 -86 val_86 2008-04-08 86 val_86 2008-04-08 -95 val_95 2008-04-08 95 val_95 2008-04-08 -95 val_95 2008-04-08 95 val_95 2008-04-08 -95 val_95 2008-04-08 95 val_95 2008-04-08 -95 val_95 2008-04-08 95 val_95 2008-04-08 -97 val_97 2008-04-08 97 val_97 2008-04-08 -97 val_97 2008-04-08 97 val_97 2008-04-08 -97 val_97 2008-04-08 97 val_97 2008-04-08 -97 val_97 2008-04-08 97 val_97 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 105 val_105 2008-04-08 105 val_105 2008-04-08 +11 val_11 2008-04-08 11 val_11 2008-04-08 114 val_114 2008-04-08 114 val_114 2008-04-08 116 val_116 2008-04-08 116 val_116 2008-04-08 118 val_118 2008-04-08 118 val_118 2008-04-08 @@ -447,6 +393,10 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 149 val_149 2008-04-08 149 val_149 2008-04-08 149 val_149 2008-04-08 149 val_149 2008-04-08 149 val_149 2008-04-08 149 val_149 2008-04-08 +15 val_15 2008-04-08 15 val_15 2008-04-08 +15 val_15 2008-04-08 15 val_15 2008-04-08 +15 val_15 2008-04-08 15 val_15 2008-04-08 +15 val_15 2008-04-08 15 val_15 2008-04-08 150 val_150 2008-04-08 150 val_150 2008-04-08 152 val_152 2008-04-08 152 val_152 2008-04-08 152 val_152 2008-04-08 152 val_152 2008-04-08 @@ -484,6 +434,7 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 169 val_169 2008-04-08 169 val_169 2008-04-08 169 val_169 2008-04-08 169 val_169 2008-04-08 169 val_169 2008-04-08 169 val_169 2008-04-08 +17 val_17 2008-04-08 17 val_17 2008-04-08 170 val_170 2008-04-08 170 val_170 2008-04-08 172 val_172 2008-04-08 172 val_172 2008-04-08 172 val_172 2008-04-08 172 val_172 2008-04-08 @@ -510,10 +461,13 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 187 val_187 2008-04-08 187 val_187 2008-04-08 187 val_187 2008-04-08 187 val_187 2008-04-08 189 val_189 2008-04-08 189 val_189 2008-04-08 +19 val_19 2008-04-08 19 val_19 2008-04-08 190 val_190 2008-04-08 190 val_190 2008-04-08 192 val_192 2008-04-08 192 val_192 2008-04-08 194 val_194 2008-04-08 194 val_194 2008-04-08 196 val_196 2008-04-08 196 val_196 2008-04-08 +2 val_2 2008-04-08 2 val_2 2008-04-08 +20 val_20 2008-04-08 20 val_20 2008-04-08 200 val_200 2008-04-08 200 val_200 2008-04-08 200 val_200 2008-04-08 200 val_200 2008-04-08 200 val_200 2008-04-08 200 val_200 2008-04-08 @@ -560,6 +514,10 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 239 val_239 2008-04-08 239 val_239 2008-04-08 239 val_239 2008-04-08 239 val_239 2008-04-08 239 val_239 2008-04-08 239 val_239 2008-04-08 +24 val_24 2008-04-08 24 val_24 2008-04-08 +24 val_24 2008-04-08 24 val_24 2008-04-08 +24 val_24 2008-04-08 24 val_24 2008-04-08 +24 val_24 2008-04-08 24 val_24 2008-04-08 242 val_242 2008-04-08 242 val_242 2008-04-08 242 val_242 2008-04-08 242 val_242 2008-04-08 242 val_242 2008-04-08 242 val_242 2008-04-08 @@ -571,6 +529,10 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 255 val_255 2008-04-08 255 val_255 2008-04-08 255 val_255 2008-04-08 255 val_255 2008-04-08 257 val_257 2008-04-08 257 val_257 2008-04-08 +26 val_26 2008-04-08 26 val_26 2008-04-08 +26 val_26 2008-04-08 26 val_26 2008-04-08 +26 val_26 2008-04-08 26 val_26 2008-04-08 +26 val_26 2008-04-08 26 val_26 2008-04-08 260 val_260 2008-04-08 260 val_260 2008-04-08 262 val_262 2008-04-08 262 val_262 2008-04-08 266 val_266 2008-04-08 266 val_266 2008-04-08 @@ -600,6 +562,7 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 277 val_277 2008-04-08 277 val_277 2008-04-08 277 val_277 2008-04-08 277 val_277 2008-04-08 277 val_277 2008-04-08 277 val_277 2008-04-08 +28 val_28 2008-04-08 28 val_28 2008-04-08 280 val_280 2008-04-08 280 val_280 2008-04-08 280 val_280 2008-04-08 280 val_280 2008-04-08 280 val_280 2008-04-08 280 val_280 2008-04-08 @@ -661,11 +624,21 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 327 val_327 2008-04-08 327 val_327 2008-04-08 327 val_327 2008-04-08 327 val_327 2008-04-08 327 val_327 2008-04-08 327 val_327 2008-04-08 +33 val_33 2008-04-08 33 val_33 2008-04-08 332 val_332 2008-04-08 332 val_332 2008-04-08 336 val_336 2008-04-08 336 val_336 2008-04-08 338 val_338 2008-04-08 338 val_338 2008-04-08 341 val_341 2008-04-08 341 val_341 2008-04-08 345 val_345 2008-04-08 345 val_345 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 356 val_356 2008-04-08 356 val_356 2008-04-08 365 val_365 2008-04-08 365 val_365 2008-04-08 367 val_367 2008-04-08 367 val_367 2008-04-08 @@ -681,6 +654,10 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 369 val_369 2008-04-08 369 val_369 2008-04-08 369 val_369 2008-04-08 369 val_369 2008-04-08 369 val_369 2008-04-08 369 val_369 2008-04-08 +37 val_37 2008-04-08 37 val_37 2008-04-08 +37 val_37 2008-04-08 37 val_37 2008-04-08 +37 val_37 2008-04-08 37 val_37 2008-04-08 +37 val_37 2008-04-08 37 val_37 2008-04-08 374 val_374 2008-04-08 374 val_374 2008-04-08 378 val_378 2008-04-08 378 val_378 2008-04-08 389 val_389 2008-04-08 389 val_389 2008-04-08 @@ -695,6 +672,7 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 396 val_396 2008-04-08 396 val_396 2008-04-08 396 val_396 2008-04-08 396 val_396 2008-04-08 396 val_396 2008-04-08 396 val_396 2008-04-08 +4 val_4 2008-04-08 4 val_4 2008-04-08 400 val_400 2008-04-08 400 val_400 2008-04-08 402 val_402 2008-04-08 402 val_402 2008-04-08 404 val_404 2008-04-08 404 val_404 2008-04-08 @@ -732,6 +710,10 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 417 val_417 2008-04-08 417 val_417 2008-04-08 417 val_417 2008-04-08 417 val_417 2008-04-08 419 val_419 2008-04-08 419 val_419 2008-04-08 +42 val_42 2008-04-08 42 val_42 2008-04-08 +42 val_42 2008-04-08 42 val_42 2008-04-08 +42 val_42 2008-04-08 42 val_42 2008-04-08 +42 val_42 2008-04-08 42 val_42 2008-04-08 424 val_424 2008-04-08 424 val_424 2008-04-08 424 val_424 2008-04-08 424 val_424 2008-04-08 424 val_424 2008-04-08 424 val_424 2008-04-08 @@ -751,6 +733,7 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 439 val_439 2008-04-08 439 val_439 2008-04-08 439 val_439 2008-04-08 439 val_439 2008-04-08 439 val_439 2008-04-08 439 val_439 2008-04-08 +44 val_44 2008-04-08 44 val_44 2008-04-08 444 val_444 2008-04-08 444 val_444 2008-04-08 446 val_446 2008-04-08 446 val_446 2008-04-08 448 val_448 2008-04-08 448 val_448 2008-04-08 @@ -809,68 +792,6 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 493 val_493 2008-04-08 493 val_493 2008-04-08 495 val_495 2008-04-08 495 val_495 2008-04-08 497 val_497 2008-04-08 497 val_497 2008-04-08 -PREHOOK: query: select * from tab a join tab_part b on a.key = b.key -PREHOOK: type: QUERY -PREHOOK: Input: default@tab -PREHOOK: Input: default@tab@ds=2008-04-08 -PREHOOK: Input: default@tab_part -PREHOOK: Input: default@tab_part@ds=2008-04-08 -#### A masked pattern was here #### -POSTHOOK: query: select * from tab a join tab_part b on a.key = b.key -POSTHOOK: type: QUERY -POSTHOOK: Input: default@tab -POSTHOOK: Input: default@tab@ds=2008-04-08 -POSTHOOK: Input: default@tab_part -POSTHOOK: Input: default@tab_part@ds=2008-04-08 -#### A masked pattern was here #### -0 val_0 2008-04-08 0 val_0 2008-04-08 -0 val_0 2008-04-08 0 val_0 2008-04-08 -0 val_0 2008-04-08 0 val_0 2008-04-08 -0 val_0 2008-04-08 0 val_0 2008-04-08 -0 val_0 2008-04-08 0 val_0 2008-04-08 -0 val_0 2008-04-08 0 val_0 2008-04-08 -0 val_0 2008-04-08 0 val_0 2008-04-08 -0 val_0 2008-04-08 0 val_0 2008-04-08 -0 val_0 2008-04-08 0 val_0 2008-04-08 -2 val_2 2008-04-08 2 val_2 2008-04-08 -4 val_4 2008-04-08 4 val_4 2008-04-08 -8 val_8 2008-04-08 8 val_8 2008-04-08 -11 val_11 2008-04-08 11 val_11 2008-04-08 -15 val_15 2008-04-08 15 val_15 2008-04-08 -15 val_15 2008-04-08 15 val_15 2008-04-08 -15 val_15 2008-04-08 15 val_15 2008-04-08 -15 val_15 2008-04-08 15 val_15 2008-04-08 -17 val_17 2008-04-08 17 val_17 2008-04-08 -19 val_19 2008-04-08 19 val_19 2008-04-08 -20 val_20 2008-04-08 20 val_20 2008-04-08 -24 val_24 2008-04-08 24 val_24 2008-04-08 -24 val_24 2008-04-08 24 val_24 2008-04-08 -24 val_24 2008-04-08 24 val_24 2008-04-08 -24 val_24 2008-04-08 24 val_24 2008-04-08 -26 val_26 2008-04-08 26 val_26 2008-04-08 -26 val_26 2008-04-08 26 val_26 2008-04-08 -26 val_26 2008-04-08 26 val_26 2008-04-08 -26 val_26 2008-04-08 26 val_26 2008-04-08 -28 val_28 2008-04-08 28 val_28 2008-04-08 -33 val_33 2008-04-08 33 val_33 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -37 val_37 2008-04-08 37 val_37 2008-04-08 -37 val_37 2008-04-08 37 val_37 2008-04-08 -37 val_37 2008-04-08 37 val_37 2008-04-08 -37 val_37 2008-04-08 37 val_37 2008-04-08 -42 val_42 2008-04-08 42 val_42 2008-04-08 -42 val_42 2008-04-08 42 val_42 2008-04-08 -42 val_42 2008-04-08 42 val_42 2008-04-08 -42 val_42 2008-04-08 42 val_42 2008-04-08 -44 val_44 2008-04-08 44 val_44 2008-04-08 51 val_51 2008-04-08 51 val_51 2008-04-08 51 val_51 2008-04-08 51 val_51 2008-04-08 51 val_51 2008-04-08 51 val_51 2008-04-08 @@ -880,6 +801,7 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 64 val_64 2008-04-08 64 val_64 2008-04-08 66 val_66 2008-04-08 66 val_66 2008-04-08 77 val_77 2008-04-08 77 val_77 2008-04-08 +8 val_8 2008-04-08 8 val_8 2008-04-08 80 val_80 2008-04-08 80 val_80 2008-04-08 82 val_82 2008-04-08 82 val_82 2008-04-08 84 val_84 2008-04-08 84 val_84 2008-04-08 @@ -895,11 +817,37 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 97 val_97 2008-04-08 97 val_97 2008-04-08 97 val_97 2008-04-08 97 val_97 2008-04-08 97 val_97 2008-04-08 97 val_97 2008-04-08 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from tab a join tab_part b on a.key = b.key +PREHOOK: type: QUERY +PREHOOK: Input: default@tab +PREHOOK: Input: default@tab@ds=2008-04-08 +PREHOOK: Input: default@tab_part +PREHOOK: Input: default@tab_part@ds=2008-04-08 +#### A masked pattern was here #### +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from tab a join tab_part b on a.key = b.key +POSTHOOK: type: QUERY +POSTHOOK: Input: default@tab +POSTHOOK: Input: default@tab@ds=2008-04-08 +POSTHOOK: Input: default@tab_part +POSTHOOK: Input: default@tab_part@ds=2008-04-08 +#### A masked pattern was here #### +0 val_0 2008-04-08 0 val_0 2008-04-08 +0 val_0 2008-04-08 0 val_0 2008-04-08 +0 val_0 2008-04-08 0 val_0 2008-04-08 +0 val_0 2008-04-08 0 val_0 2008-04-08 +0 val_0 2008-04-08 0 val_0 2008-04-08 +0 val_0 2008-04-08 0 val_0 2008-04-08 +0 val_0 2008-04-08 0 val_0 2008-04-08 +0 val_0 2008-04-08 0 val_0 2008-04-08 +0 val_0 2008-04-08 0 val_0 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 105 val_105 2008-04-08 105 val_105 2008-04-08 +11 val_11 2008-04-08 11 val_11 2008-04-08 114 val_114 2008-04-08 114 val_114 2008-04-08 116 val_116 2008-04-08 116 val_116 2008-04-08 118 val_118 2008-04-08 118 val_118 2008-04-08 @@ -941,6 +889,10 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 149 val_149 2008-04-08 149 val_149 2008-04-08 149 val_149 2008-04-08 149 val_149 2008-04-08 149 val_149 2008-04-08 149 val_149 2008-04-08 +15 val_15 2008-04-08 15 val_15 2008-04-08 +15 val_15 2008-04-08 15 val_15 2008-04-08 +15 val_15 2008-04-08 15 val_15 2008-04-08 +15 val_15 2008-04-08 15 val_15 2008-04-08 150 val_150 2008-04-08 150 val_150 2008-04-08 152 val_152 2008-04-08 152 val_152 2008-04-08 152 val_152 2008-04-08 152 val_152 2008-04-08 @@ -978,6 +930,7 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 169 val_169 2008-04-08 169 val_169 2008-04-08 169 val_169 2008-04-08 169 val_169 2008-04-08 169 val_169 2008-04-08 169 val_169 2008-04-08 +17 val_17 2008-04-08 17 val_17 2008-04-08 170 val_170 2008-04-08 170 val_170 2008-04-08 172 val_172 2008-04-08 172 val_172 2008-04-08 172 val_172 2008-04-08 172 val_172 2008-04-08 @@ -1004,10 +957,13 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 187 val_187 2008-04-08 187 val_187 2008-04-08 187 val_187 2008-04-08 187 val_187 2008-04-08 189 val_189 2008-04-08 189 val_189 2008-04-08 +19 val_19 2008-04-08 19 val_19 2008-04-08 190 val_190 2008-04-08 190 val_190 2008-04-08 192 val_192 2008-04-08 192 val_192 2008-04-08 194 val_194 2008-04-08 194 val_194 2008-04-08 196 val_196 2008-04-08 196 val_196 2008-04-08 +2 val_2 2008-04-08 2 val_2 2008-04-08 +20 val_20 2008-04-08 20 val_20 2008-04-08 200 val_200 2008-04-08 200 val_200 2008-04-08 200 val_200 2008-04-08 200 val_200 2008-04-08 200 val_200 2008-04-08 200 val_200 2008-04-08 @@ -1054,6 +1010,10 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 239 val_239 2008-04-08 239 val_239 2008-04-08 239 val_239 2008-04-08 239 val_239 2008-04-08 239 val_239 2008-04-08 239 val_239 2008-04-08 +24 val_24 2008-04-08 24 val_24 2008-04-08 +24 val_24 2008-04-08 24 val_24 2008-04-08 +24 val_24 2008-04-08 24 val_24 2008-04-08 +24 val_24 2008-04-08 24 val_24 2008-04-08 242 val_242 2008-04-08 242 val_242 2008-04-08 242 val_242 2008-04-08 242 val_242 2008-04-08 242 val_242 2008-04-08 242 val_242 2008-04-08 @@ -1065,6 +1025,10 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 255 val_255 2008-04-08 255 val_255 2008-04-08 255 val_255 2008-04-08 255 val_255 2008-04-08 257 val_257 2008-04-08 257 val_257 2008-04-08 +26 val_26 2008-04-08 26 val_26 2008-04-08 +26 val_26 2008-04-08 26 val_26 2008-04-08 +26 val_26 2008-04-08 26 val_26 2008-04-08 +26 val_26 2008-04-08 26 val_26 2008-04-08 260 val_260 2008-04-08 260 val_260 2008-04-08 262 val_262 2008-04-08 262 val_262 2008-04-08 266 val_266 2008-04-08 266 val_266 2008-04-08 @@ -1094,6 +1058,7 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 277 val_277 2008-04-08 277 val_277 2008-04-08 277 val_277 2008-04-08 277 val_277 2008-04-08 277 val_277 2008-04-08 277 val_277 2008-04-08 +28 val_28 2008-04-08 28 val_28 2008-04-08 280 val_280 2008-04-08 280 val_280 2008-04-08 280 val_280 2008-04-08 280 val_280 2008-04-08 280 val_280 2008-04-08 280 val_280 2008-04-08 @@ -1155,11 +1120,21 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 327 val_327 2008-04-08 327 val_327 2008-04-08 327 val_327 2008-04-08 327 val_327 2008-04-08 327 val_327 2008-04-08 327 val_327 2008-04-08 +33 val_33 2008-04-08 33 val_33 2008-04-08 332 val_332 2008-04-08 332 val_332 2008-04-08 336 val_336 2008-04-08 336 val_336 2008-04-08 338 val_338 2008-04-08 338 val_338 2008-04-08 341 val_341 2008-04-08 341 val_341 2008-04-08 345 val_345 2008-04-08 345 val_345 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 356 val_356 2008-04-08 356 val_356 2008-04-08 365 val_365 2008-04-08 365 val_365 2008-04-08 367 val_367 2008-04-08 367 val_367 2008-04-08 @@ -1175,6 +1150,10 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 369 val_369 2008-04-08 369 val_369 2008-04-08 369 val_369 2008-04-08 369 val_369 2008-04-08 369 val_369 2008-04-08 369 val_369 2008-04-08 +37 val_37 2008-04-08 37 val_37 2008-04-08 +37 val_37 2008-04-08 37 val_37 2008-04-08 +37 val_37 2008-04-08 37 val_37 2008-04-08 +37 val_37 2008-04-08 37 val_37 2008-04-08 374 val_374 2008-04-08 374 val_374 2008-04-08 378 val_378 2008-04-08 378 val_378 2008-04-08 389 val_389 2008-04-08 389 val_389 2008-04-08 @@ -1189,6 +1168,7 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 396 val_396 2008-04-08 396 val_396 2008-04-08 396 val_396 2008-04-08 396 val_396 2008-04-08 396 val_396 2008-04-08 396 val_396 2008-04-08 +4 val_4 2008-04-08 4 val_4 2008-04-08 400 val_400 2008-04-08 400 val_400 2008-04-08 402 val_402 2008-04-08 402 val_402 2008-04-08 404 val_404 2008-04-08 404 val_404 2008-04-08 @@ -1226,6 +1206,10 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 417 val_417 2008-04-08 417 val_417 2008-04-08 417 val_417 2008-04-08 417 val_417 2008-04-08 419 val_419 2008-04-08 419 val_419 2008-04-08 +42 val_42 2008-04-08 42 val_42 2008-04-08 +42 val_42 2008-04-08 42 val_42 2008-04-08 +42 val_42 2008-04-08 42 val_42 2008-04-08 +42 val_42 2008-04-08 42 val_42 2008-04-08 424 val_424 2008-04-08 424 val_424 2008-04-08 424 val_424 2008-04-08 424 val_424 2008-04-08 424 val_424 2008-04-08 424 val_424 2008-04-08 @@ -1245,6 +1229,7 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 439 val_439 2008-04-08 439 val_439 2008-04-08 439 val_439 2008-04-08 439 val_439 2008-04-08 439 val_439 2008-04-08 439 val_439 2008-04-08 +44 val_44 2008-04-08 44 val_44 2008-04-08 444 val_444 2008-04-08 444 val_444 2008-04-08 446 val_446 2008-04-08 446 val_446 2008-04-08 448 val_448 2008-04-08 448 val_448 2008-04-08 @@ -1303,6 +1288,31 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 493 val_493 2008-04-08 493 val_493 2008-04-08 495 val_495 2008-04-08 495 val_495 2008-04-08 497 val_497 2008-04-08 497 val_497 2008-04-08 +51 val_51 2008-04-08 51 val_51 2008-04-08 +51 val_51 2008-04-08 51 val_51 2008-04-08 +51 val_51 2008-04-08 51 val_51 2008-04-08 +51 val_51 2008-04-08 51 val_51 2008-04-08 +53 val_53 2008-04-08 53 val_53 2008-04-08 +57 val_57 2008-04-08 57 val_57 2008-04-08 +64 val_64 2008-04-08 64 val_64 2008-04-08 +66 val_66 2008-04-08 66 val_66 2008-04-08 +77 val_77 2008-04-08 77 val_77 2008-04-08 +8 val_8 2008-04-08 8 val_8 2008-04-08 +80 val_80 2008-04-08 80 val_80 2008-04-08 +82 val_82 2008-04-08 82 val_82 2008-04-08 +84 val_84 2008-04-08 84 val_84 2008-04-08 +84 val_84 2008-04-08 84 val_84 2008-04-08 +84 val_84 2008-04-08 84 val_84 2008-04-08 +84 val_84 2008-04-08 84 val_84 2008-04-08 +86 val_86 2008-04-08 86 val_86 2008-04-08 +95 val_95 2008-04-08 95 val_95 2008-04-08 +95 val_95 2008-04-08 95 val_95 2008-04-08 +95 val_95 2008-04-08 95 val_95 2008-04-08 +95 val_95 2008-04-08 95 val_95 2008-04-08 +97 val_97 2008-04-08 97 val_97 2008-04-08 +97 val_97 2008-04-08 97 val_97 2008-04-08 +97 val_97 2008-04-08 97 val_97 2008-04-08 +97 val_97 2008-04-08 97 val_97 2008-04-08 PREHOOK: query: explain select count(*) from tab a left outer join tab_part b on a.key = b.key diff --git a/ql/src/test/results/clientpositive/orc_merge1.q.out b/ql/src/test/results/clientpositive/orc_merge1.q.out index 2927791..472433d 100644 --- a/ql/src/test/results/clientpositive/orc_merge1.q.out +++ b/ql/src/test/results/clientpositive/orc_merge1.q.out @@ -209,13 +209,15 @@ STAGE PLANS: hdfs directory: true #### A masked pattern was here #### -PREHOOK: query: INSERT OVERWRITE TABLE orcfile_merge1b PARTITION (ds='1', part) +PREHOOK: query: -- SORT_QUERY_RESULTS +INSERT OVERWRITE TABLE orcfile_merge1b PARTITION (ds='1', part) SELECT key, value, PMOD(HASH(key), 2) as part FROM src PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@orcfile_merge1b@ds=1 -POSTHOOK: query: INSERT OVERWRITE TABLE orcfile_merge1b PARTITION (ds='1', part) +POSTHOOK: query: -- SORT_QUERY_RESULTS +INSERT OVERWRITE TABLE orcfile_merge1b PARTITION (ds='1', part) SELECT key, value, PMOD(HASH(key), 2) as part FROM src POSTHOOK: type: QUERY @@ -315,13 +317,15 @@ STAGE PLANS: hdfs directory: true #### A masked pattern was here #### -PREHOOK: query: INSERT OVERWRITE TABLE orcfile_merge1c PARTITION (ds='1', part) +PREHOOK: query: -- SORT_QUERY_RESULTS +INSERT OVERWRITE TABLE orcfile_merge1c PARTITION (ds='1', part) SELECT key, value, PMOD(HASH(key), 2) as part FROM src PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@orcfile_merge1c@ds=1 -POSTHOOK: query: INSERT OVERWRITE TABLE orcfile_merge1c PARTITION (ds='1', part) +POSTHOOK: query: -- SORT_QUERY_RESULTS +INSERT OVERWRITE TABLE orcfile_merge1c PARTITION (ds='1', part) SELECT key, value, PMOD(HASH(key), 2) as part FROM src POSTHOOK: type: QUERY @@ -335,6 +339,7 @@ POSTHOOK: Lineage: orcfile_merge1c PARTITION(ds=1,part=1).value SIMPLE [(src)src Found 1 items #### A masked pattern was here #### PREHOOK: query: -- Verify +-- SORT_QUERY_RESULTS SELECT SUM(HASH(c)) FROM ( SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM orcfile_merge1 WHERE ds='1' @@ -345,6 +350,7 @@ PREHOOK: Input: default@orcfile_merge1@ds=1/part=0 PREHOOK: Input: default@orcfile_merge1@ds=1/part=1 #### A masked pattern was here #### POSTHOOK: query: -- Verify +-- SORT_QUERY_RESULTS SELECT SUM(HASH(c)) FROM ( SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM orcfile_merge1 WHERE ds='1' @@ -355,7 +361,8 @@ POSTHOOK: Input: default@orcfile_merge1@ds=1/part=0 POSTHOOK: Input: default@orcfile_merge1@ds=1/part=1 #### A masked pattern was here #### -21975308766 -PREHOOK: query: SELECT SUM(HASH(c)) FROM ( +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT SUM(HASH(c)) FROM ( SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM orcfile_merge1b WHERE ds='1' ) t @@ -364,7 +371,8 @@ PREHOOK: Input: default@orcfile_merge1b PREHOOK: Input: default@orcfile_merge1b@ds=1/part=0 PREHOOK: Input: default@orcfile_merge1b@ds=1/part=1 #### A masked pattern was here #### -POSTHOOK: query: SELECT SUM(HASH(c)) FROM ( +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT SUM(HASH(c)) FROM ( SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM orcfile_merge1b WHERE ds='1' ) t @@ -374,7 +382,8 @@ POSTHOOK: Input: default@orcfile_merge1b@ds=1/part=0 POSTHOOK: Input: default@orcfile_merge1b@ds=1/part=1 #### A masked pattern was here #### -21975308766 -PREHOOK: query: SELECT SUM(HASH(c)) FROM ( +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT SUM(HASH(c)) FROM ( SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM orcfile_merge1c WHERE ds='1' ) t @@ -383,7 +392,8 @@ PREHOOK: Input: default@orcfile_merge1c PREHOOK: Input: default@orcfile_merge1c@ds=1/part=0 PREHOOK: Input: default@orcfile_merge1c@ds=1/part=1 #### A masked pattern was here #### -POSTHOOK: query: SELECT SUM(HASH(c)) FROM ( +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT SUM(HASH(c)) FROM ( SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM orcfile_merge1c WHERE ds='1' ) t diff --git a/ql/src/test/results/clientpositive/script_env_var1.q.out b/ql/src/test/results/clientpositive/script_env_var1.q.out index 5ab1c20..cd39eb8 100644 --- a/ql/src/test/results/clientpositive/script_env_var1.q.out +++ b/ql/src/test/results/clientpositive/script_env_var1.q.out @@ -1,16 +1,16 @@ PREHOOK: query: -- Verifies that script operator ID environment variables have unique values -- in each instance of the script operator. SELECT count(1) FROM -( SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' AS key FROM src LIMIT 1)x UNION ALL - SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' AS key FROM src LIMIT 1)y ) a GROUP BY key +( SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' AS key FROM src order by key LIMIT 1)x UNION ALL + SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' AS key FROM src order by key LIMIT 1)y ) a GROUP BY key PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### POSTHOOK: query: -- Verifies that script operator ID environment variables have unique values -- in each instance of the script operator. SELECT count(1) FROM -( SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' AS key FROM src LIMIT 1)x UNION ALL - SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' AS key FROM src LIMIT 1)y ) a GROUP BY key +( SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' AS key FROM src order by key LIMIT 1)x UNION ALL + SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' AS key FROM src order by key LIMIT 1)y ) a GROUP BY key POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/selectDistinctStar.q.out b/ql/src/test/results/clientpositive/selectDistinctStar.q.out index 4c8564e..80fe86d 100644 --- a/ql/src/test/results/clientpositive/selectDistinctStar.q.out +++ b/ql/src/test/results/clientpositive/selectDistinctStar.q.out @@ -1,6 +1,8 @@ -PREHOOK: query: explain select distinct src.* from src +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select distinct src.* from src PREHOOK: type: QUERY -POSTHOOK: query: explain select distinct src.* from src +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select distinct src.* from src POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -47,11 +49,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select distinct src.* from src +PREHOOK: query: -- SORT_QUERY_RESULTS +select distinct src.* from src PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: select distinct src.* from src +POSTHOOK: query: -- SORT_QUERY_RESULTS +select distinct src.* from src POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -364,11 +368,13 @@ POSTHOOK: Input: default@src 96 val_96 97 val_97 98 val_98 -PREHOOK: query: select distinct * from src +PREHOOK: query: -- SORT_QUERY_RESULTS +select distinct * from src PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: select distinct * from src +POSTHOOK: query: -- SORT_QUERY_RESULTS +select distinct * from src POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -681,9 +687,11 @@ POSTHOOK: Input: default@src 96 val_96 97 val_97 98 val_98 -PREHOOK: query: explain select distinct * from src where key < '3' +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select distinct * from src where key < '3' PREHOOK: type: QUERY -POSTHOOK: query: explain select distinct * from src where key < '3' +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select distinct * from src where key < '3' POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -733,11 +741,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select distinct * from src where key < '3' +PREHOOK: query: -- SORT_QUERY_RESULTS +select distinct * from src where key < '3' PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: select distinct * from src where key < '3' +POSTHOOK: query: -- SORT_QUERY_RESULTS +select distinct * from src where key < '3' POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -882,22 +892,26 @@ POSTHOOK: Input: default@src 292 val_292 296 val_296 298 val_298 -PREHOOK: query: from src a select distinct a.* where a.key = '238' +PREHOOK: query: -- SORT_QUERY_RESULTS +from src a select distinct a.* where a.key = '238' PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: from src a select distinct a.* where a.key = '238' +POSTHOOK: query: -- SORT_QUERY_RESULTS +from src a select distinct a.* where a.key = '238' POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### 238 val_238 -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT distinct * from ( select * from src1 union all select * from src )subq PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT distinct * from ( select * from src1 union all @@ -969,7 +983,8 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT distinct * from ( +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT distinct * from ( select * from src1 union all select * from src )subq @@ -977,7 +992,8 @@ PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@src1 #### A masked pattern was here #### -POSTHOOK: query: SELECT distinct * from ( +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT distinct * from ( select * from src1 union all select * from src )subq @@ -1308,9 +1324,11 @@ PREHOOK: query: drop view if exists sdi PREHOOK: type: DROPVIEW POSTHOOK: query: drop view if exists sdi POSTHOOK: type: DROPVIEW -PREHOOK: query: explain create view sdi as select distinct * from src order by key limit 2 +PREHOOK: query: -- SORT_QUERY_RESULTS +explain create view sdi as select distinct * from src order by key limit 2 PREHOOK: type: CREATEVIEW -POSTHOOK: query: explain create view sdi as select distinct * from src order by key limit 2 +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain create view sdi as select distinct * from src order by key limit 2 POSTHOOK: type: CREATEVIEW STAGE DEPENDENCIES: Stage-0 is a root stage @@ -1325,12 +1343,14 @@ STAGE PLANS: name: default.sdi original text: select distinct * from src order by key limit 2 -PREHOOK: query: create view sdi as select distinct * from src order by key limit 2 +PREHOOK: query: -- SORT_QUERY_RESULTS +create view sdi as select distinct * from src order by key limit 2 PREHOOK: type: CREATEVIEW PREHOOK: Input: default@src PREHOOK: Output: database:default PREHOOK: Output: default@sdi -POSTHOOK: query: create view sdi as select distinct * from src order by key limit 2 +POSTHOOK: query: -- SORT_QUERY_RESULTS +create view sdi as select distinct * from src order by key limit 2 POSTHOOK: type: CREATEVIEW POSTHOOK: Input: default@src POSTHOOK: Output: database:default @@ -1377,28 +1397,39 @@ Sort Columns: [] # View Information View Original Text: select distinct * from src order by key limit 2 View Expanded Text: select distinct `src`.`key`, `src`.`value` from `default`.`src` order by `src`.`key` limit 2 -PREHOOK: query: select * from sdi +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from sdi PREHOOK: type: QUERY PREHOOK: Input: default@sdi PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: select * from sdi +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from sdi POSTHOOK: type: QUERY POSTHOOK: Input: default@sdi POSTHOOK: Input: default@src #### A masked pattern was here #### 0 val_0 10 val_10 -PREHOOK: query: select distinct * from src union all select distinct * from src1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select distinct * from src union all select distinct * from src1 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@src1 #### A masked pattern was here #### -POSTHOOK: query: select distinct * from src union all select distinct * from src1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select distinct * from src union all select distinct * from src1 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@src1 #### A masked pattern was here #### + + val_165 + val_193 + val_265 + val_27 + val_409 + val_484 0 val_0 10 val_10 100 val_100 @@ -1416,6 +1447,7 @@ POSTHOOK: Input: default@src1 120 val_120 125 val_125 126 val_126 +128 128 val_128 129 val_129 131 val_131 @@ -1427,9 +1459,11 @@ POSTHOOK: Input: default@src1 143 val_143 145 val_145 146 val_146 +146 val_146 149 val_149 15 val_15 150 val_150 +150 val_150 152 val_152 153 val_153 155 val_155 @@ -1482,6 +1516,7 @@ POSTHOOK: Input: default@src1 208 val_208 209 val_209 213 val_213 +213 val_213 214 val_214 216 val_216 217 val_217 @@ -1490,6 +1525,7 @@ POSTHOOK: Input: default@src1 221 val_221 222 val_222 223 val_223 +224 224 val_224 226 val_226 228 val_228 @@ -1499,6 +1535,7 @@ POSTHOOK: Input: default@src1 235 val_235 237 val_237 238 val_238 +238 val_238 239 val_239 24 val_24 241 val_241 @@ -1509,6 +1546,7 @@ POSTHOOK: Input: default@src1 249 val_249 252 val_252 255 val_255 +255 val_255 256 val_256 257 val_257 258 val_258 @@ -1521,10 +1559,12 @@ POSTHOOK: Input: default@src1 27 val_27 272 val_272 273 val_273 +273 val_273 274 val_274 275 val_275 277 val_277 278 val_278 +278 val_278 28 val_28 280 val_280 281 val_281 @@ -1549,6 +1589,7 @@ POSTHOOK: Input: default@src1 309 val_309 310 val_310 311 val_311 +311 val_311 315 val_315 316 val_316 317 val_317 @@ -1583,6 +1624,7 @@ POSTHOOK: Input: default@src1 366 val_366 367 val_367 368 val_368 +369 369 val_369 37 val_37 373 val_373 @@ -1605,10 +1647,12 @@ POSTHOOK: Input: default@src1 4 val_4 400 val_400 401 val_401 +401 val_401 402 val_402 403 val_403 404 val_404 406 val_406 +406 val_406 407 val_407 409 val_409 41 val_41 @@ -1685,6 +1729,7 @@ POSTHOOK: Input: default@src1 64 val_64 65 val_65 66 val_66 +66 val_66 67 val_67 69 val_69 70 val_70 @@ -1708,34 +1753,15 @@ POSTHOOK: Input: default@src1 96 val_96 97 val_97 98 val_98 - - val_165 - val_193 - val_265 - val_27 - val_409 - val_484 -128 -146 val_146 -150 val_150 -213 val_213 -224 -238 val_238 -255 val_255 -273 val_273 -278 val_278 -311 val_311 -369 -401 val_401 -406 val_406 -66 val_66 98 val_98 -PREHOOK: query: select distinct * from src join src1 on src.key=src1.key +PREHOOK: query: -- SORT_QUERY_RESULTS +select distinct * from src join src1 on src.key=src1.key PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@src1 #### A masked pattern was here #### -POSTHOOK: query: select distinct * from src join src1 on src.key=src1.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +select distinct * from src join src1 on src.key=src1.key POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@src1 @@ -1755,7 +1781,8 @@ POSTHOOK: Input: default@src1 406 val_406 406 val_406 66 val_66 66 val_66 98 val_98 98 val_98 -PREHOOK: query: SELECT distinct * +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT distinct * FROM src1 x JOIN src y ON (x.key = y.key) JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=11) PREHOOK: type: QUERY @@ -1764,7 +1791,8 @@ PREHOOK: Input: default@src1 PREHOOK: Input: default@srcpart PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 #### A masked pattern was here #### -POSTHOOK: query: SELECT distinct * +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT distinct * FROM src1 x JOIN src y ON (x.key = y.key) JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=11) POSTHOOK: type: QUERY @@ -1785,14 +1813,16 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 406 val_406 2008-04-08 11 406 val_406 406 val_406 66 val_66 2008-04-08 11 66 val_66 66 val_66 98 val_98 2008-04-08 11 98 val_98 98 val_98 -PREHOOK: query: select * from (select distinct * from src)src1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from (select distinct * from src)src1 join (select distinct * from src)src2 on src1.key=src2.key PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: select * from (select distinct * from src)src1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from (select distinct * from src)src1 join (select distinct * from src)src2 on src1.key=src2.key @@ -2108,11 +2138,13 @@ POSTHOOK: Input: default@src 96 val_96 96 val_96 97 val_97 97 val_97 98 val_98 98 val_98 -PREHOOK: query: select distinct * from (select distinct * from src)src1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select distinct * from (select distinct * from src)src1 PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: select distinct * from (select distinct * from src)src1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select distinct * from (select distinct * from src)src1 POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -2425,9 +2457,11 @@ POSTHOOK: Input: default@src 96 val_96 97 val_97 98 val_98 -PREHOOK: query: explain select distinct src.* from src +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select distinct src.* from src PREHOOK: type: QUERY -POSTHOOK: query: explain select distinct src.* from src +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select distinct src.* from src POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -2474,11 +2508,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select distinct src.* from src +PREHOOK: query: -- SORT_QUERY_RESULTS +select distinct src.* from src PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: select distinct src.* from src +POSTHOOK: query: -- SORT_QUERY_RESULTS +select distinct src.* from src POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -2791,11 +2827,13 @@ POSTHOOK: Input: default@src 96 val_96 97 val_97 98 val_98 -PREHOOK: query: select distinct * from src +PREHOOK: query: -- SORT_QUERY_RESULTS +select distinct * from src PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: select distinct * from src +POSTHOOK: query: -- SORT_QUERY_RESULTS +select distinct * from src POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -3108,9 +3146,11 @@ POSTHOOK: Input: default@src 96 val_96 97 val_97 98 val_98 -PREHOOK: query: explain select distinct * from src where key < '3' +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select distinct * from src where key < '3' PREHOOK: type: QUERY -POSTHOOK: query: explain select distinct * from src where key < '3' +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select distinct * from src where key < '3' POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -3160,11 +3200,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select distinct * from src where key < '3' +PREHOOK: query: -- SORT_QUERY_RESULTS +select distinct * from src where key < '3' PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: select distinct * from src where key < '3' +POSTHOOK: query: -- SORT_QUERY_RESULTS +select distinct * from src where key < '3' POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -3309,22 +3351,26 @@ POSTHOOK: Input: default@src 292 val_292 296 val_296 298 val_298 -PREHOOK: query: from src a select distinct a.* where a.key = '238' +PREHOOK: query: -- SORT_QUERY_RESULTS +from src a select distinct a.* where a.key = '238' PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: from src a select distinct a.* where a.key = '238' +POSTHOOK: query: -- SORT_QUERY_RESULTS +from src a select distinct a.* where a.key = '238' POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### 238 val_238 -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT distinct * from ( select * from src1 union all select * from src )subq PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT distinct * from ( select * from src1 union all @@ -3396,7 +3442,8 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT distinct * from ( +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT distinct * from ( select * from src1 union all select * from src )subq @@ -3404,7 +3451,8 @@ PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@src1 #### A masked pattern was here #### -POSTHOOK: query: SELECT distinct * from ( +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT distinct * from ( select * from src1 union all select * from src )subq @@ -3739,9 +3787,11 @@ POSTHOOK: query: drop view if exists sdi POSTHOOK: type: DROPVIEW POSTHOOK: Input: default@sdi POSTHOOK: Output: default@sdi -PREHOOK: query: explain create view sdi as select distinct * from src order by key limit 2 +PREHOOK: query: -- SORT_QUERY_RESULTS +explain create view sdi as select distinct * from src order by key limit 2 PREHOOK: type: CREATEVIEW -POSTHOOK: query: explain create view sdi as select distinct * from src order by key limit 2 +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain create view sdi as select distinct * from src order by key limit 2 POSTHOOK: type: CREATEVIEW STAGE DEPENDENCIES: Stage-0 is a root stage @@ -3808,28 +3858,39 @@ Sort Columns: [] # View Information View Original Text: select distinct * from src order by key limit 2 View Expanded Text: select distinct `src`.`key`, `src`.`value` from `default`.`src` order by `src`.`key` limit 2 -PREHOOK: query: select * from sdi +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from sdi PREHOOK: type: QUERY PREHOOK: Input: default@sdi PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: select * from sdi +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from sdi POSTHOOK: type: QUERY POSTHOOK: Input: default@sdi POSTHOOK: Input: default@src #### A masked pattern was here #### 0 val_0 10 val_10 -PREHOOK: query: select distinct * from src union all select distinct * from src1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select distinct * from src union all select distinct * from src1 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@src1 #### A masked pattern was here #### -POSTHOOK: query: select distinct * from src union all select distinct * from src1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select distinct * from src union all select distinct * from src1 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@src1 #### A masked pattern was here #### + + val_165 + val_193 + val_265 + val_27 + val_409 + val_484 0 val_0 10 val_10 100 val_100 @@ -3847,6 +3908,7 @@ POSTHOOK: Input: default@src1 120 val_120 125 val_125 126 val_126 +128 128 val_128 129 val_129 131 val_131 @@ -3858,9 +3920,11 @@ POSTHOOK: Input: default@src1 143 val_143 145 val_145 146 val_146 +146 val_146 149 val_149 15 val_15 150 val_150 +150 val_150 152 val_152 153 val_153 155 val_155 @@ -3913,6 +3977,7 @@ POSTHOOK: Input: default@src1 208 val_208 209 val_209 213 val_213 +213 val_213 214 val_214 216 val_216 217 val_217 @@ -3921,6 +3986,7 @@ POSTHOOK: Input: default@src1 221 val_221 222 val_222 223 val_223 +224 224 val_224 226 val_226 228 val_228 @@ -3930,6 +3996,7 @@ POSTHOOK: Input: default@src1 235 val_235 237 val_237 238 val_238 +238 val_238 239 val_239 24 val_24 241 val_241 @@ -3940,6 +4007,7 @@ POSTHOOK: Input: default@src1 249 val_249 252 val_252 255 val_255 +255 val_255 256 val_256 257 val_257 258 val_258 @@ -3952,10 +4020,12 @@ POSTHOOK: Input: default@src1 27 val_27 272 val_272 273 val_273 +273 val_273 274 val_274 275 val_275 277 val_277 278 val_278 +278 val_278 28 val_28 280 val_280 281 val_281 @@ -3980,6 +4050,7 @@ POSTHOOK: Input: default@src1 309 val_309 310 val_310 311 val_311 +311 val_311 315 val_315 316 val_316 317 val_317 @@ -4014,6 +4085,7 @@ POSTHOOK: Input: default@src1 366 val_366 367 val_367 368 val_368 +369 369 val_369 37 val_37 373 val_373 @@ -4036,10 +4108,12 @@ POSTHOOK: Input: default@src1 4 val_4 400 val_400 401 val_401 +401 val_401 402 val_402 403 val_403 404 val_404 406 val_406 +406 val_406 407 val_407 409 val_409 41 val_41 @@ -4116,6 +4190,7 @@ POSTHOOK: Input: default@src1 64 val_64 65 val_65 66 val_66 +66 val_66 67 val_67 69 val_69 70 val_70 @@ -4139,34 +4214,15 @@ POSTHOOK: Input: default@src1 96 val_96 97 val_97 98 val_98 - - val_165 - val_193 - val_265 - val_27 - val_409 - val_484 -128 -146 val_146 -150 val_150 -213 val_213 -224 -238 val_238 -255 val_255 -273 val_273 -278 val_278 -311 val_311 -369 -401 val_401 -406 val_406 -66 val_66 98 val_98 -PREHOOK: query: select distinct * from src join src1 on src.key=src1.key +PREHOOK: query: -- SORT_QUERY_RESULTS +select distinct * from src join src1 on src.key=src1.key PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@src1 #### A masked pattern was here #### -POSTHOOK: query: select distinct * from src join src1 on src.key=src1.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +select distinct * from src join src1 on src.key=src1.key POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@src1 @@ -4186,7 +4242,8 @@ POSTHOOK: Input: default@src1 406 val_406 406 val_406 66 val_66 66 val_66 98 val_98 98 val_98 -PREHOOK: query: SELECT distinct * +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT distinct * FROM src1 x JOIN src y ON (x.key = y.key) JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=11) PREHOOK: type: QUERY @@ -4195,7 +4252,8 @@ PREHOOK: Input: default@src1 PREHOOK: Input: default@srcpart PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 #### A masked pattern was here #### -POSTHOOK: query: SELECT distinct * +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT distinct * FROM src1 x JOIN src y ON (x.key = y.key) JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=11) POSTHOOK: type: QUERY @@ -4216,14 +4274,16 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 406 val_406 2008-04-08 11 406 val_406 406 val_406 66 val_66 2008-04-08 11 66 val_66 66 val_66 98 val_98 2008-04-08 11 98 val_98 98 val_98 -PREHOOK: query: select * from (select distinct * from src)src1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from (select distinct * from src)src1 join (select distinct * from src)src2 on src1.key=src2.key PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: select * from (select distinct * from src)src1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from (select distinct * from src)src1 join (select distinct * from src)src2 on src1.key=src2.key @@ -4539,11 +4599,13 @@ POSTHOOK: Input: default@src 96 val_96 96 val_96 97 val_97 97 val_97 98 val_98 98 val_98 -PREHOOK: query: select distinct * from (select distinct * from src)src1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select distinct * from (select distinct * from src)src1 PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: select distinct * from (select distinct * from src)src1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select distinct * from (select distinct * from src)src1 POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/skewjoin.q.out b/ql/src/test/results/clientpositive/skewjoin.q.out index 27f2ffc..3fc8f24 100644 --- a/ql/src/test/results/clientpositive/skewjoin.q.out +++ b/ql/src/test/results/clientpositive/skewjoin.q.out @@ -70,11 +70,13 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T4 POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@t4 -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value POSTHOOK: type: QUERY @@ -198,12 +200,14 @@ STAGE PLANS: Stage: Stage-2 Stats-Aggr Operator -PREHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key) +PREHOOK: query: -- SORT_QUERY_RESULTS +FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@dest_j1 -POSTHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key) +POSTHOOK: query: -- SORT_QUERY_RESULTS +FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src @@ -219,13 +223,15 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@dest_j1 #### A masked pattern was here #### 278697 101852390308 -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN SELECT /*+ STREAMTABLE(a) */ * FROM T1 a JOIN T2 b ON a.key = b.key JOIN T3 c ON b.key = c.key JOIN T4 d ON c.key = d.key PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN SELECT /*+ STREAMTABLE(a) */ * FROM T1 a JOIN T2 b ON a.key = b.key JOIN T3 c ON b.key = c.key @@ -318,7 +324,8 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT /*+ STREAMTABLE(a) */ * +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ STREAMTABLE(a) */ * FROM T1 a JOIN T2 b ON a.key = b.key JOIN T3 c ON b.key = c.key JOIN T4 d ON c.key = d.key @@ -328,7 +335,8 @@ PREHOOK: Input: default@t2 PREHOOK: Input: default@t3 PREHOOK: Input: default@t4 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ STREAMTABLE(a) */ * +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ STREAMTABLE(a) */ * FROM T1 a JOIN T2 b ON a.key = b.key JOIN T3 c ON b.key = c.key JOIN T4 d ON c.key = d.key @@ -339,13 +347,15 @@ POSTHOOK: Input: default@t3 POSTHOOK: Input: default@t4 #### A masked pattern was here #### 2 12 2 22 2 12 2 12 -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN SELECT /*+ STREAMTABLE(a,c) */ * FROM T1 a JOIN T2 b ON a.key = b.key JOIN T3 c ON b.key = c.key JOIN T4 d ON c.key = d.key PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN SELECT /*+ STREAMTABLE(a,c) */ * FROM T1 a JOIN T2 b ON a.key = b.key JOIN T3 c ON b.key = c.key @@ -438,7 +448,8 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT /*+ STREAMTABLE(a,c) */ * +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ STREAMTABLE(a,c) */ * FROM T1 a JOIN T2 b ON a.key = b.key JOIN T3 c ON b.key = c.key JOIN T4 d ON c.key = d.key @@ -448,7 +459,8 @@ PREHOOK: Input: default@t2 PREHOOK: Input: default@t3 PREHOOK: Input: default@t4 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ STREAMTABLE(a,c) */ * +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ STREAMTABLE(a,c) */ * FROM T1 a JOIN T2 b ON a.key = b.key JOIN T3 c ON b.key = c.key JOIN T4 d ON c.key = d.key @@ -459,9 +471,11 @@ POSTHOOK: Input: default@t3 POSTHOOK: Input: default@t4 #### A masked pattern was here #### 2 12 2 22 2 12 2 12 -PREHOOK: query: EXPLAIN FROM T1 a JOIN src c ON c.key+1=a.key SELECT /*+ STREAMTABLE(a) */ sum(hash(a.key)), sum(hash(a.val)), sum(hash(c.key)) +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN FROM T1 a JOIN src c ON c.key+1=a.key SELECT /*+ STREAMTABLE(a) */ sum(hash(a.key)), sum(hash(a.val)), sum(hash(c.key)) PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN FROM T1 a JOIN src c ON c.key+1=a.key SELECT /*+ STREAMTABLE(a) */ sum(hash(a.key)), sum(hash(a.val)), sum(hash(c.key)) +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN FROM T1 a JOIN src c ON c.key+1=a.key SELECT /*+ STREAMTABLE(a) */ sum(hash(a.key)), sum(hash(a.val)), sum(hash(c.key)) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -545,25 +559,29 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: FROM T1 a JOIN src c ON c.key+1=a.key SELECT /*+ STREAMTABLE(a) */ sum(hash(a.key)), sum(hash(a.val)), sum(hash(c.key)) +PREHOOK: query: -- SORT_QUERY_RESULTS +FROM T1 a JOIN src c ON c.key+1=a.key SELECT /*+ STREAMTABLE(a) */ sum(hash(a.key)), sum(hash(a.val)), sum(hash(c.key)) PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@t1 #### A masked pattern was here #### -POSTHOOK: query: FROM T1 a JOIN src c ON c.key+1=a.key SELECT /*+ STREAMTABLE(a) */ sum(hash(a.key)), sum(hash(a.val)), sum(hash(c.key)) +POSTHOOK: query: -- SORT_QUERY_RESULTS +FROM T1 a JOIN src c ON c.key+1=a.key SELECT /*+ STREAMTABLE(a) */ sum(hash(a.key)), sum(hash(a.val)), sum(hash(c.key)) POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@t1 #### A masked pattern was here #### 198 6274 194 -PREHOOK: query: EXPLAIN FROM +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN FROM (SELECT src.* FROM src) x JOIN (SELECT src.* FROM src) Y ON (x.key = Y.key) SELECT sum(hash(Y.key)), sum(hash(Y.value)) PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN FROM +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN FROM (SELECT src.* FROM src) x JOIN (SELECT src.* FROM src) Y @@ -711,7 +729,8 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: FROM +PREHOOK: query: -- SORT_QUERY_RESULTS +FROM (SELECT src.* FROM src) x JOIN (SELECT src.* FROM src) Y @@ -720,7 +739,8 @@ SELECT sum(hash(Y.key)), sum(hash(Y.value)) PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: FROM +POSTHOOK: query: -- SORT_QUERY_RESULTS +FROM (SELECT src.* FROM src) x JOIN (SELECT src.* FROM src) Y @@ -730,14 +750,16 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### 44481300 101852390308 -PREHOOK: query: EXPLAIN FROM +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN FROM (SELECT src.* FROM src) x JOIN (SELECT src.* FROM src) Y ON (x.key = Y.key and substring(x.value, 5)=substring(y.value, 5)+1) SELECT sum(hash(Y.key)), sum(hash(Y.value)) PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN FROM +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN FROM (SELECT src.* FROM src) x JOIN (SELECT src.* FROM src) Y @@ -885,7 +907,8 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: FROM +PREHOOK: query: -- SORT_QUERY_RESULTS +FROM (SELECT src.* FROM src) x JOIN (SELECT src.* FROM src) Y @@ -894,7 +917,8 @@ SELECT sum(hash(Y.key)), sum(hash(Y.value)) PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: FROM +POSTHOOK: query: -- SORT_QUERY_RESULTS +FROM (SELECT src.* FROM src) x JOIN (SELECT src.* FROM src) Y diff --git a/ql/src/test/results/clientpositive/spark/auto_join0.q.out b/ql/src/test/results/clientpositive/spark/auto_join0.q.out index c3979f4..9599849 100644 --- a/ql/src/test/results/clientpositive/spark/auto_join0.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_join0.q.out @@ -1,23 +1,25 @@ -Warning: Map Join MAPJOIN[20][bigTable=?] in task 'Stage-1:MAPRED' is a cross product -PREHOOK: query: explain +Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Stage-1:MAPRED' is a cross product +PREHOOK: query: -- SORT_QUERY_RESULTS +explain 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 PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain 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 POSTHOOK: type: QUERY @@ -29,9 +31,11 @@ STAGE DEPENDENCIES: STAGE PLANS: Stage: Stage-2 Spark + Edges: + Reducer 6 <- Map 5 (SORT, 1) #### A masked pattern was here #### Vertices: - Map 4 + Map 5 Map Operator Tree: TableScan alias: src @@ -43,18 +47,29 @@ STAGE PLANS: expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE - Spark HashTable Sink Operator - keys: - 0 - 1 + Reduce Output Operator + key expressions: _col0 (type: string), _col1 (type: string) + sort order: ++ + Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE + Reducer 6 Local Work: Map Reduce Local Work + Reduce Operator Tree: + Select Operator + expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE + Spark HashTable Sink Operator + keys: + 0 + 1 Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (GROUP, 1) + Reducer 2 <- Map 1 (SORT, 1) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 4 <- Reducer 3 (GROUP, 1) #### A masked pattern was here #### Vertices: Map 1 @@ -69,23 +84,33 @@ STAGE PLANS: expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE - Map Join Operator - condition map: - Inner Join 0 to 1 - keys: - 0 - 1 - outputColumnNames: _col0, _col1, _col2, _col3 - input vertices: - 1 Map 4 - Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string) - sort order: ++++ - Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col0 (type: string), _col1 (type: string) + sort order: ++ + Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE + Reducer 2 Local Work: Map Reduce Local Work - Reducer 2 + Reduce Operator Tree: + Select Operator + expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE + Map Join Operator + condition map: + Inner Join 0 to 1 + keys: + 0 + 1 + outputColumnNames: _col0, _col1, _col2, _col3 + input vertices: + 1 Reducer 6 + Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string) + sort order: ++++ + Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE + Reducer 3 Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string), KEY.reducesinkkey2 (type: string), KEY.reducesinkkey3 (type: string) @@ -100,7 +125,7 @@ STAGE PLANS: sort order: Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE value expressions: _col0 (type: bigint) - Reducer 3 + Reducer 4 Reduce Operator Tree: Group By Operator aggregations: sum(VALUE._col0) @@ -121,26 +146,28 @@ STAGE PLANS: Processor Tree: ListSink -Warning: Map Join MAPJOIN[20][bigTable=?] in task 'Stage-1:MAPRED' is a cross product -PREHOOK: query: select sum(hash(a.k1,a.v1,a.k2, a.v2)) +Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Stage-1:MAPRED' is a cross product +PREHOOK: query: -- SORT_QUERY_RESULTS +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 PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: select sum(hash(a.k1,a.v1,a.k2, a.v2)) +POSTHOOK: query: -- SORT_QUERY_RESULTS +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 POSTHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/spark/auto_join1.q.out b/ql/src/test/results/clientpositive/spark/auto_join1.q.out index b640b9d..3063add 100644 --- a/ql/src/test/results/clientpositive/spark/auto_join1.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_join1.q.out @@ -6,12 +6,14 @@ POSTHOOK: query: CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 -PREHOOK: query: explain -FROM src src1 JOIN src src2 ON (src1.key = src2.key) +PREHOOK: query: -- SORT_QUERY_RESULTS +explain +FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value PREHOOK: type: QUERY -POSTHOOK: query: explain -FROM src src1 JOIN src src2 ON (src1.key = src2.key) +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain +FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -90,12 +92,14 @@ STAGE PLANS: Stage: Stage-2 Stats-Aggr Operator -PREHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key) +PREHOOK: query: -- SORT_QUERY_RESULTS +FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@dest_j1 -POSTHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key) +POSTHOOK: query: -- SORT_QUERY_RESULTS +FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src diff --git a/ql/src/test/results/clientpositive/spark/auto_join29.q.out b/ql/src/test/results/clientpositive/spark/auto_join29.q.out index 41a98c1..2ece101 100644 --- a/ql/src/test/results/clientpositive/spark/auto_join29.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_join29.q.out @@ -112,11 +112,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -620,10 +622,12 @@ NULL NULL NULL NULL 97 val_97 NULL NULL NULL NULL 97 val_97 NULL NULL NULL NULL 98 val_98 NULL NULL NULL NULL 98 val_98 -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -733,11 +737,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -1241,10 +1247,12 @@ POSTHOOK: Input: default@src 97 val_97 NULL NULL NULL NULL 98 val_98 NULL NULL NULL NULL 98 val_98 NULL NULL NULL NULL -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -1354,11 +1362,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -1874,10 +1884,12 @@ NULL NULL 97 val_97 NULL NULL NULL NULL 97 val_97 NULL NULL NULL NULL 98 val_98 NULL NULL NULL NULL 98 val_98 NULL NULL -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -1984,11 +1996,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -2504,10 +2518,12 @@ NULL NULL NULL NULL 97 val_97 NULL NULL NULL NULL 97 val_97 NULL NULL NULL NULL 98 val_98 NULL NULL NULL NULL 98 val_98 -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -2608,18 +2624,22 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -2729,11 +2749,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -3237,10 +3259,12 @@ NULL NULL NULL NULL 97 val_97 NULL NULL NULL NULL 97 val_97 NULL NULL NULL NULL 98 val_98 NULL NULL NULL NULL 98 val_98 -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -3350,18 +3374,22 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -3474,11 +3502,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -3504,10 +3534,12 @@ NULL NULL 5 val_5 5 val_5 NULL NULL 5 val_5 5 val_5 NULL NULL 8 val_8 8 val_8 NULL NULL 9 val_9 9 val_9 -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -3608,11 +3640,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/cbo_gby.q.out b/ql/src/test/results/clientpositive/spark/cbo_gby.q.out index 67c7a63..c4e848d 100644 --- a/ql/src/test/results/clientpositive/spark/cbo_gby.q.out +++ b/ql/src/test/results/clientpositive/spark/cbo_gby.q.out @@ -1,34 +1,39 @@ PREHOOK: query: -- 6. Test Select + TS + Join + Fil + GB + GB Having +-- SORT_QUERY_RESULTS select key, (c_int+1)+2 as x, sum(c_int) from cbo_t1 group by c_float, cbo_t1.c_int, key PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### POSTHOOK: query: -- 6. Test Select + TS + Join + Fil + GB + GB Having +-- SORT_QUERY_RESULTS select key, (c_int+1)+2 as x, sum(c_int) from cbo_t1 group by c_float, cbo_t1.c_int, key POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -1 4 12 -NULL NULL NULL 1 4 2 -1 4 2 1 4 2 -PREHOOK: query: select x, y, count(*) from (select key, (c_int+c_float+1+2) as x, sum(c_int) as y from cbo_t1 group by c_float, cbo_t1.c_int, key) R group by y, x +1 4 12 +1 4 2 +NULL NULL NULL +PREHOOK: query: --SORT_QUERY_RESULTS +select x, y, count(*) from (select key, (c_int+c_float+1+2) as x, sum(c_int) as y from cbo_t1 group by c_float, cbo_t1.c_int, key) R group by y, x PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -POSTHOOK: query: select x, y, count(*) from (select key, (c_int+c_float+1+2) as x, sum(c_int) as y from cbo_t1 group by c_float, cbo_t1.c_int, key) R group by y, x +POSTHOOK: query: --SORT_QUERY_RESULTS +select x, y, count(*) from (select key, (c_int+c_float+1+2) as x, sum(c_int) as y from cbo_t1 group by c_float, cbo_t1.c_int, key) R group by y, x POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -NULL NULL 1 5.0 12 1 5.0 2 3 -PREHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key order by a) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key order by q/10 desc, r asc) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c order by cbo_t3.c_int+c desc, c +NULL NULL 1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key order by a) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key order by q/10 desc, r asc) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c order by cbo_t3.c_int+c desc, c PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 @@ -36,7 +41,8 @@ PREHOOK: Input: default@cbo_t2 PREHOOK: Input: default@cbo_t2@dt=2014 PREHOOK: Input: default@cbo_t3 #### A masked pattern was here #### -POSTHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key order by a) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key order by q/10 desc, r asc) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c order by cbo_t3.c_int+c desc, c +POSTHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key order by a) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key order by q/10 desc, r asc) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c order by cbo_t3.c_int+c desc, c POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 @@ -46,7 +52,8 @@ POSTHOOK: Input: default@cbo_t3 #### A masked pattern was here #### 1 12 6 1 2 6 -PREHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b % c asc, b desc) cbo_t1 left outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p left outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int % c asc, cbo_t3.c_int desc +PREHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b % c asc, b desc) cbo_t1 left outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p left outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int % c asc, cbo_t3.c_int desc PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 @@ -54,7 +61,8 @@ PREHOOK: Input: default@cbo_t2 PREHOOK: Input: default@cbo_t2@dt=2014 PREHOOK: Input: default@cbo_t3 #### A masked pattern was here #### -POSTHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b % c asc, b desc) cbo_t1 left outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p left outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int % c asc, cbo_t3.c_int desc +POSTHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b % c asc, b desc) cbo_t1 left outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p left outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int % c asc, cbo_t3.c_int desc POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 @@ -62,9 +70,10 @@ POSTHOOK: Input: default@cbo_t2 POSTHOOK: Input: default@cbo_t2@dt=2014 POSTHOOK: Input: default@cbo_t3 #### A masked pattern was here #### -1 2 6 1 12 6 -PREHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b+c, a desc) cbo_t1 right outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p right outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 2) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c +1 2 6 +PREHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b+c, a desc) cbo_t1 right outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p right outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 2) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 @@ -72,7 +81,8 @@ PREHOOK: Input: default@cbo_t2 PREHOOK: Input: default@cbo_t2@dt=2014 PREHOOK: Input: default@cbo_t3 #### A masked pattern was here #### -POSTHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b+c, a desc) cbo_t1 right outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p right outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 2) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c +POSTHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b+c, a desc) cbo_t1 right outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p right outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 2) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 @@ -80,9 +90,10 @@ POSTHOOK: Input: default@cbo_t2 POSTHOOK: Input: default@cbo_t2@dt=2014 POSTHOOK: Input: default@cbo_t3 #### A masked pattern was here #### -1 2 6 1 12 6 -PREHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by c+a desc) cbo_t1 full outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by p+q desc, r asc) cbo_t2 on cbo_t1.a=p full outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int +1 2 6 +PREHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by c+a desc) cbo_t1 full outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by p+q desc, r asc) cbo_t2 on cbo_t1.a=p full outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 @@ -90,7 +101,8 @@ PREHOOK: Input: default@cbo_t2 PREHOOK: Input: default@cbo_t2@dt=2014 PREHOOK: Input: default@cbo_t3 #### A masked pattern was here #### -POSTHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by c+a desc) cbo_t1 full outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by p+q desc, r asc) cbo_t2 on cbo_t1.a=p full outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int +POSTHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by c+a desc) cbo_t1 full outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by p+q desc, r asc) cbo_t2 on cbo_t1.a=p full outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 @@ -98,9 +110,10 @@ POSTHOOK: Input: default@cbo_t2 POSTHOOK: Input: default@cbo_t2@dt=2014 POSTHOOK: Input: default@cbo_t3 #### A masked pattern was here #### -1 2 6 1 12 6 -PREHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c +1 2 6 +PREHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 @@ -108,7 +121,8 @@ PREHOOK: Input: default@cbo_t2 PREHOOK: Input: default@cbo_t2@dt=2014 PREHOOK: Input: default@cbo_t3 #### A masked pattern was here #### -POSTHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c +POSTHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 @@ -116,5 +130,5 @@ POSTHOOK: Input: default@cbo_t2 POSTHOOK: Input: default@cbo_t2@dt=2014 POSTHOOK: Input: default@cbo_t3 #### A masked pattern was here #### -1 2 6 1 12 6 +1 2 6 diff --git a/ql/src/test/results/clientpositive/spark/cbo_udf_udaf.q.out b/ql/src/test/results/clientpositive/spark/cbo_udf_udaf.q.out index 932943d..ac362d1 100644 --- a/ql/src/test/results/clientpositive/spark/cbo_udf_udaf.q.out +++ b/ql/src/test/results/clientpositive/spark/cbo_udf_udaf.q.out @@ -21,8 +21,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -2 0 NULL NULL NULL NULL 3 6 18 18 18 1.0 1 1 2 36 +2 0 NULL NULL NULL NULL 3 6 PREHOOK: query: select * from (select count(*) as a, count(distinct c_int) as b, sum(c_int) as c, avg(c_int) as d, max(c_int) as e, min(c_int) as f from cbo_t1) cbo_t1 PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 @@ -44,8 +44,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -2 0 NULL NULL NULL NULL 3 6 18 1 18 1.0 1 1 2 36 +2 0 NULL NULL NULL NULL 3 6 PREHOOK: query: select f,a,e,b from (select count(*) as a, count(c_int) as b, sum(c_int) as c, avg(c_int) as d, max(c_int) as e, min(c_int) as f from cbo_t1) cbo_t1 PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 @@ -68,21 +68,23 @@ POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### 1 20 1 1 -PREHOOK: query: select key,count(c_int) as a, avg(c_float) from cbo_t1 group by key order by a +PREHOOK: query: -- SORT_QUERY_RESULTS +select key,count(c_int) as a, avg(c_float) from cbo_t1 group by key order by a PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -POSTHOOK: query: select key,count(c_int) as a, avg(c_float) from cbo_t1 group by key order by a +POSTHOOK: query: -- SORT_QUERY_RESULTS +select key,count(c_int) as a, avg(c_float) from cbo_t1 group by key order by a POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -NULL 0 NULL - 1 2 1.0 1 2 1.0 -1 2 1.0 + 1 2 1.0 1 12 1.0 +1 2 1.0 +NULL 0 NULL PREHOOK: query: select count(distinct c_int) as a, avg(c_float) from cbo_t1 group by c_float order by a PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 diff --git a/ql/src/test/results/clientpositive/spark/cross_product_check_1.q.out b/ql/src/test/results/clientpositive/spark/cross_product_check_1.q.out index bd4b5cb..c886d65 100644 --- a/ql/src/test/results/clientpositive/spark/cross_product_check_1.q.out +++ b/ql/src/test/results/clientpositive/spark/cross_product_check_1.q.out @@ -25,9 +25,11 @@ POSTHOOK: Input: default@src POSTHOOK: Output: database:default POSTHOOK: Output: default@B Warning: Shuffle Join JOIN[4][tables = [a, b]] in Work 'Reducer 2' is a cross product -PREHOOK: query: explain select * from A join B +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join B PREHOOK: type: QUERY -POSTHOOK: query: explain select * from A join B +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join B POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -87,9 +89,11 @@ STAGE PLANS: ListSink Warning: Shuffle Join JOIN[10][tables = [d1, d2, a]] in Work 'Reducer 3' is a cross product -PREHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from B d1 join B d2 on d1.key = d2.key join A PREHOOK: type: QUERY -POSTHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from B d1 join B d2 on d1.key = d2.key join A POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -183,14 +187,16 @@ STAGE PLANS: ListSink Warning: Shuffle Join JOIN[16][tables = [a, od1]] in Work 'Reducer 4' is a cross product -PREHOOK: query: explain select * from A join +PREHOOK: query: -- SORT_QUERY_RESULTS +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 where 1 = 1 group by d1.key) od1 PREHOOK: type: QUERY -POSTHOOK: query: explain select * from A join +POSTHOOK: query: -- SORT_QUERY_RESULTS +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 where 1 = 1 group by d1.key) od1 POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -302,9 +308,11 @@ STAGE PLANS: Warning: Shuffle Join JOIN[4][tables = [d1, d2]] in Work 'Reducer 2' is a cross product Warning: Shuffle Join JOIN[14][tables = [a, od1]] in Work 'Reducer 4' is a cross product -PREHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 PREHOOK: type: QUERY -POSTHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -405,12 +413,14 @@ STAGE PLANS: ListSink Warning: Shuffle Join JOIN[21][tables = [ss, od1]] in Work 'Reducer 3' is a cross product -PREHOOK: query: explain select * from -(select A.key from A group by key) ss join +PREHOOK: query: -- SORT_QUERY_RESULTS +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 PREHOOK: type: QUERY -POSTHOOK: query: explain select * from -(select A.key from A group by key) ss join +POSTHOOK: query: -- SORT_QUERY_RESULTS +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 POSTHOOK: type: QUERY STAGE DEPENDENCIES: diff --git a/ql/src/test/results/clientpositive/spark/cross_product_check_2.q.out b/ql/src/test/results/clientpositive/spark/cross_product_check_2.q.out index 7f3f130..861c6e7 100644 --- a/ql/src/test/results/clientpositive/spark/cross_product_check_2.q.out +++ b/ql/src/test/results/clientpositive/spark/cross_product_check_2.q.out @@ -11,23 +11,25 @@ POSTHOOK: Input: default@src POSTHOOK: Output: database:default POSTHOOK: Output: default@A PREHOOK: query: create table B as -select * from src +select * from src order by key limit 10 PREHOOK: type: CREATETABLE_AS_SELECT PREHOOK: Input: default@src PREHOOK: Output: database:default PREHOOK: Output: default@B POSTHOOK: query: create table B as -select * from src +select * from src order by key limit 10 POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@src POSTHOOK: Output: database:default POSTHOOK: Output: default@B Warning: Map Join MAPJOIN[7][bigTable=a] in task 'Stage-1:MAPRED' is a cross product -PREHOOK: query: explain select * from A join B +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join B PREHOOK: type: QUERY -POSTHOOK: query: explain select * from A join B +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join B POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-2 is a root stage @@ -43,7 +45,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Spark HashTable Sink Operator keys: 0 @@ -91,9 +93,11 @@ STAGE PLANS: ListSink Warning: Map Join MAPJOIN[15][bigTable=a] in task 'Stage-1:MAPRED' is a cross product -PREHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from B d1 join B d2 on d1.key = d2.key join A PREHOOK: type: QUERY -POSTHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from B d1 join B d2 on d1.key = d2.key join A POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-3 is a root stage @@ -110,10 +114,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d2 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE Column stats: NONE Spark HashTable Sink Operator keys: 0 key (type: string) @@ -129,10 +133,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d1 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -142,7 +146,7 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col5, _col6 input vertices: 1 Map 2 - Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE Spark HashTable Sink Operator keys: 0 @@ -190,12 +194,14 @@ STAGE PLANS: ListSink Warning: Map Join MAPJOIN[21][bigTable=a] in task 'Stage-1:MAPRED' is a cross product -PREHOOK: query: explain select * from A join +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join (select d1.key from B d1 join B d2 on d1.key = d2.key where 1 = 1 group by d1.key) od1 PREHOOK: type: QUERY -POSTHOOK: query: explain select * from A join +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join (select d1.key from B d1 join B d2 on d1.key = d2.key where 1 = 1 group by d1.key) od1 @@ -215,10 +221,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d2 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE Column stats: NONE Spark HashTable Sink Operator keys: 0 key (type: string) @@ -236,10 +242,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d1 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -249,17 +255,17 @@ STAGE PLANS: outputColumnNames: _col0 input vertices: 1 Map 3 - Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: _col0 (type: string) mode: hash outputColumnNames: _col0 - Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE Local Work: Map Reduce Local Work Reducer 2 @@ -270,7 +276,7 @@ STAGE PLANS: keys: KEY._col0 (type: string) mode: mergepartial outputColumnNames: _col0 - Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 2 Data size: 20 Basic stats: COMPLETE Column stats: NONE Spark HashTable Sink Operator keys: 0 @@ -317,9 +323,11 @@ STAGE PLANS: Warning: Map Join MAPJOIN[17][bigTable=a] in task 'Stage-1:MAPRED' is a cross product Warning: Map Join MAPJOIN[18][bigTable=d1] in task 'Stage-2:MAPRED' is a cross product -PREHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 PREHOOK: type: QUERY -POSTHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-3 is a root stage @@ -336,7 +344,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d2 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: COMPLETE Spark HashTable Sink Operator keys: 0 @@ -354,7 +362,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d1 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -364,17 +372,17 @@ STAGE PLANS: outputColumnNames: _col0 input vertices: 1 Map 3 - Statistics: Num rows: 11 Data size: 114 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 105 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: _col0 (type: string) mode: hash outputColumnNames: _col0 - Statistics: Num rows: 11 Data size: 114 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 105 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 11 Data size: 114 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 105 Basic stats: COMPLETE Column stats: NONE Local Work: Map Reduce Local Work Reducer 2 @@ -385,7 +393,7 @@ STAGE PLANS: keys: KEY._col0 (type: string) mode: mergepartial outputColumnNames: _col0 - Statistics: Num rows: 5 Data size: 51 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 47 Basic stats: COMPLETE Column stats: NONE Spark HashTable Sink Operator keys: 0 @@ -431,11 +439,13 @@ STAGE PLANS: ListSink Warning: Map Join MAPJOIN[26][bigTable=?] in task 'Stage-1:MAPRED' is a cross product -PREHOOK: query: explain select * from +PREHOOK: query: -- SORT_QUERY_RESULTS +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 PREHOOK: type: QUERY -POSTHOOK: query: explain select * from +POSTHOOK: query: -- SORT_QUERY_RESULTS +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 POSTHOOK: type: QUERY @@ -454,10 +464,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d2 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE Column stats: NONE Spark HashTable Sink Operator keys: 0 key (type: string) @@ -475,10 +485,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d1 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -488,17 +498,17 @@ STAGE PLANS: outputColumnNames: _col0 input vertices: 1 Map 5 - Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE Group By Operator keys: _col0 (type: string) mode: hash outputColumnNames: _col0 - Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE Local Work: Map Reduce Local Work Reducer 4 @@ -509,7 +519,7 @@ STAGE PLANS: keys: KEY._col0 (type: string) mode: mergepartial outputColumnNames: _col0 - Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 2 Data size: 20 Basic stats: COMPLETE Column stats: NONE Spark HashTable Sink Operator keys: 0 diff --git a/ql/src/test/results/clientpositive/spark/ctas.q.out b/ql/src/test/results/clientpositive/spark/ctas.q.out index bcd663a..18a27e9 100644 --- a/ql/src/test/results/clientpositive/spark/ctas.q.out +++ b/ql/src/test/results/clientpositive/spark/ctas.q.out @@ -108,11 +108,13 @@ POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@src POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_CTAS1 -PREHOOK: query: select * from nzhang_CTAS1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_CTAS1 PREHOOK: type: QUERY PREHOOK: Input: default@nzhang_ctas1 #### A masked pattern was here #### -POSTHOOK: query: select * from nzhang_CTAS1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_CTAS1 POSTHOOK: type: QUERY POSTHOOK: Input: default@nzhang_ctas1 #### A masked pattern was here #### @@ -252,11 +254,13 @@ POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@src POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_ctas2 -PREHOOK: query: select * from nzhang_ctas2 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas2 PREHOOK: type: QUERY PREHOOK: Input: default@nzhang_ctas2 #### A masked pattern was here #### -POSTHOOK: query: select * from nzhang_ctas2 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas2 POSTHOOK: type: QUERY POSTHOOK: Input: default@nzhang_ctas2 #### A masked pattern was here #### @@ -396,11 +400,13 @@ POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@src POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_ctas3 -PREHOOK: query: select * from nzhang_ctas3 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas3 PREHOOK: type: QUERY PREHOOK: Input: default@nzhang_ctas3 #### A masked pattern was here #### -POSTHOOK: query: select * from nzhang_ctas3 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas3 POSTHOOK: type: QUERY POSTHOOK: Input: default@nzhang_ctas3 #### A masked pattern was here #### @@ -461,11 +467,13 @@ PREHOOK: query: create table if not exists nzhang_ctas3 as select key, value fro PREHOOK: type: CREATETABLE POSTHOOK: query: create table if not exists nzhang_ctas3 as select key, value from src sort by key, value limit 2 POSTHOOK: type: CREATETABLE -PREHOOK: query: select * from nzhang_ctas3 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas3 PREHOOK: type: QUERY PREHOOK: Input: default@nzhang_ctas3 #### A masked pattern was here #### -POSTHOOK: query: select * from nzhang_ctas3 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas3 POSTHOOK: type: QUERY POSTHOOK: Input: default@nzhang_ctas3 #### A masked pattern was here #### @@ -606,11 +614,13 @@ POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@src POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_ctas4 -PREHOOK: query: select * from nzhang_ctas4 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas4 PREHOOK: type: QUERY PREHOOK: Input: default@nzhang_ctas4 #### A masked pattern was here #### -POSTHOOK: query: select * from nzhang_ctas4 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas4 POSTHOOK: type: QUERY POSTHOOK: Input: default@nzhang_ctas4 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/filter_join_breaktask2.q.out b/ql/src/test/results/clientpositive/spark/filter_join_breaktask2.q.out index 6a2396e..8e0d0f6 100644 --- a/ql/src/test/results/clientpositive/spark/filter_join_breaktask2.q.out +++ b/ql/src/test/results/clientpositive/spark/filter_join_breaktask2.q.out @@ -1,42 +1,52 @@ -PREHOOK: query: create table T1(c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string) +PREHOOK: query: -- SORT_QUERY_RESULTS +create table T1(c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string) partitioned by (ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@T1 -POSTHOOK: query: create table T1(c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string) +POSTHOOK: query: -- SORT_QUERY_RESULTS +create table T1(c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 -PREHOOK: query: create table T2(c1 string, c2 string, c3 string, c0 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string) partitioned by (ds string) +PREHOOK: query: -- SORT_QUERY_RESULTS +create table T2(c1 string, c2 string, c3 string, c0 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string) partitioned by (ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@T2 -POSTHOOK: query: create table T2(c1 string, c2 string, c3 string, c0 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string) partitioned by (ds string) +POSTHOOK: query: -- SORT_QUERY_RESULTS +create table T2(c1 string, c2 string, c3 string, c0 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 -PREHOOK: query: create table T3 (c0 bigint, c1 bigint, c2 int) partitioned by (ds string) +PREHOOK: query: -- SORT_QUERY_RESULTS +create table T3 (c0 bigint, c1 bigint, c2 int) partitioned by (ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@T3 -POSTHOOK: query: create table T3 (c0 bigint, c1 bigint, c2 int) partitioned by (ds string) +POSTHOOK: query: -- SORT_QUERY_RESULTS +create table T3 (c0 bigint, c1 bigint, c2 int) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@T3 -PREHOOK: query: create table T4 (c0 bigint, c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string, c26 string, c27 string, c28 string, c29 string, c30 string, c31 string, c32 string, c33 string, c34 string, c35 string, c36 string, c37 string, c38 string, c39 string, c40 string, c41 string, c42 string, c43 string, c44 string, c45 string, c46 string, c47 string, c48 string, c49 string, c50 string, c51 string, c52 string, c53 string, c54 string, c55 string, c56 string, c57 string, c58 string, c59 string, c60 string, c61 string, c62 string, c63 string, c64 string, c65 string, c66 string, c67 bigint, c68 string, c69 string, c70 bigint, c71 bigint, c72 bigint, c73 string, c74 string, c75 string, c76 string, c77 string, c78 string, c79 string, c80 string, c81 bigint, c82 bigint, c83 bigint) partitioned by (ds string) +PREHOOK: query: -- SORT_QUERY_RESULTS +create table T4 (c0 bigint, c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string, c26 string, c27 string, c28 string, c29 string, c30 string, c31 string, c32 string, c33 string, c34 string, c35 string, c36 string, c37 string, c38 string, c39 string, c40 string, c41 string, c42 string, c43 string, c44 string, c45 string, c46 string, c47 string, c48 string, c49 string, c50 string, c51 string, c52 string, c53 string, c54 string, c55 string, c56 string, c57 string, c58 string, c59 string, c60 string, c61 string, c62 string, c63 string, c64 string, c65 string, c66 string, c67 bigint, c68 string, c69 string, c70 bigint, c71 bigint, c72 bigint, c73 string, c74 string, c75 string, c76 string, c77 string, c78 string, c79 string, c80 string, c81 bigint, c82 bigint, c83 bigint) partitioned by (ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@T4 -POSTHOOK: query: create table T4 (c0 bigint, c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string, c26 string, c27 string, c28 string, c29 string, c30 string, c31 string, c32 string, c33 string, c34 string, c35 string, c36 string, c37 string, c38 string, c39 string, c40 string, c41 string, c42 string, c43 string, c44 string, c45 string, c46 string, c47 string, c48 string, c49 string, c50 string, c51 string, c52 string, c53 string, c54 string, c55 string, c56 string, c57 string, c58 string, c59 string, c60 string, c61 string, c62 string, c63 string, c64 string, c65 string, c66 string, c67 bigint, c68 string, c69 string, c70 bigint, c71 bigint, c72 bigint, c73 string, c74 string, c75 string, c76 string, c77 string, c78 string, c79 string, c80 string, c81 bigint, c82 bigint, c83 bigint) partitioned by (ds string) +POSTHOOK: query: -- SORT_QUERY_RESULTS +create table T4 (c0 bigint, c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string, c26 string, c27 string, c28 string, c29 string, c30 string, c31 string, c32 string, c33 string, c34 string, c35 string, c36 string, c37 string, c38 string, c39 string, c40 string, c41 string, c42 string, c43 string, c44 string, c45 string, c46 string, c47 string, c48 string, c49 string, c50 string, c51 string, c52 string, c53 string, c54 string, c55 string, c56 string, c57 string, c58 string, c59 string, c60 string, c61 string, c62 string, c63 string, c64 string, c65 string, c66 string, c67 bigint, c68 string, c69 string, c70 bigint, c71 bigint, c72 bigint, c73 string, c74 string, c75 string, c76 string, c77 string, c78 string, c79 string, c80 string, c81 bigint, c82 bigint, c83 bigint) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@T4 -PREHOOK: query: insert overwrite table T1 partition (ds='2010-04-17') select '5', '1', '1', '1', 0, 0,4 from src tablesample (1 rows) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T1 partition (ds='2010-04-17') select '5', '1', '1', '1', 0, 0,4 from src tablesample (1 rows) PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@t1@ds=2010-04-17 -POSTHOOK: query: insert overwrite table T1 partition (ds='2010-04-17') select '5', '1', '1', '1', 0, 0,4 from src tablesample (1 rows) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T1 partition (ds='2010-04-17') select '5', '1', '1', '1', 0, 0,4 from src tablesample (1 rows) POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@t1@ds=2010-04-17 @@ -47,11 +57,13 @@ POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c4 SIMPLE [] POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c5 SIMPLE [] POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c6 SIMPLE [] POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c7 SIMPLE [] -PREHOOK: query: insert overwrite table T2 partition(ds='2010-04-17') select '5','name', NULL, '2', 'kavin',NULL, '9', 'c', '8', '0', '0', '7', '1','2', '0', '3','2', NULL, '1', NULL, '3','2','0','0','5','10' from src tablesample (1 rows) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T2 partition(ds='2010-04-17') select '5','name', NULL, '2', 'kavin',NULL, '9', 'c', '8', '0', '0', '7', '1','2', '0', '3','2', NULL, '1', NULL, '3','2','0','0','5','10' from src tablesample (1 rows) PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@t2@ds=2010-04-17 -POSTHOOK: query: insert overwrite table T2 partition(ds='2010-04-17') select '5','name', NULL, '2', 'kavin',NULL, '9', 'c', '8', '0', '0', '7', '1','2', '0', '3','2', NULL, '1', NULL, '3','2','0','0','5','10' from src tablesample (1 rows) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T2 partition(ds='2010-04-17') select '5','name', NULL, '2', 'kavin',NULL, '9', 'c', '8', '0', '0', '7', '1','2', '0', '3','2', NULL, '1', NULL, '3','2','0','0','5','10' from src tablesample (1 rows) POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@t2@ds=2010-04-17 @@ -81,23 +93,27 @@ POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c6 SIMPLE [] POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c7 SIMPLE [] POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c8 SIMPLE [] POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c9 SIMPLE [] -PREHOOK: query: insert overwrite table T3 partition (ds='2010-04-17') select 4,5,0 from src tablesample (1 rows) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T3 partition (ds='2010-04-17') select 4,5,0 from src tablesample (1 rows) PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@t3@ds=2010-04-17 -POSTHOOK: query: insert overwrite table T3 partition (ds='2010-04-17') select 4,5,0 from src tablesample (1 rows) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T3 partition (ds='2010-04-17') select 4,5,0 from src tablesample (1 rows) POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@t3@ds=2010-04-17 POSTHOOK: Lineage: t3 PARTITION(ds=2010-04-17).c0 EXPRESSION [] POSTHOOK: Lineage: t3 PARTITION(ds=2010-04-17).c1 EXPRESSION [] POSTHOOK: Lineage: t3 PARTITION(ds=2010-04-17).c2 SIMPLE [] -PREHOOK: query: insert overwrite table T4 partition(ds='2010-04-17') +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T4 partition(ds='2010-04-17') select 4,'1','1','8','4','5','1','0','9','U','2','2', '0','2','1','1','J','C','A','U', '2','s', '2',NULL, NULL, NULL,NULL, NULL, NULL,'1','j', 'S', '6',NULL,'1', '2', 'J', 'g', '1', 'e', '2', '1', '2', 'U', 'P', 'p', '3', '0', '0', '0', '1', '1', '1', '0', '0', '0', '6', '2', 'j',NULL, NULL, NULL,NULL,NULL, NULL, '5',NULL, 'j', 'j', 2, 2, 1, '2', '2', '1', '1', '1', '1', '1', '1', 1, 1, 32,NULL from src limit 1 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@t4@ds=2010-04-17 -POSTHOOK: query: insert overwrite table T4 partition(ds='2010-04-17') +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T4 partition(ds='2010-04-17') select 4,'1','1','8','4','5','1','0','9','U','2','2', '0','2','1','1','J','C','A','U', '2','s', '2',NULL, NULL, NULL,NULL, NULL, NULL,'1','j', 'S', '6',NULL,'1', '2', 'J', 'g', '1', 'e', '2', '1', '2', 'U', 'P', 'p', '3', '0', '0', '0', '1', '1', '1', '0', '0', '0', '6', '2', 'j',NULL, NULL, NULL,NULL,NULL, NULL, '5',NULL, 'j', 'j', 2, 2, 1, '2', '2', '1', '1', '1', '1', '1', '1', 1, 1, 32,NULL from src limit 1 POSTHOOK: type: QUERY POSTHOOK: Input: default@src @@ -186,52 +202,61 @@ POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c81 EXPRESSION [] POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c82 EXPRESSION [] POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c83 EXPRESSION [] POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c9 SIMPLE [] -PREHOOK: query: select * from T2 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from T2 PREHOOK: type: QUERY PREHOOK: Input: default@t2 PREHOOK: Input: default@t2@ds=2010-04-17 #### A masked pattern was here #### -POSTHOOK: query: select * from T2 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from T2 POSTHOOK: type: QUERY POSTHOOK: Input: default@t2 POSTHOOK: Input: default@t2@ds=2010-04-17 #### A masked pattern was here #### 5 name NULL 2 kavin NULL 9 c 8 0 0 7 1 2 0 3 2 NULL 1 NULL 3 2 0 0 5 10 2010-04-17 -PREHOOK: query: select * from T1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from T1 PREHOOK: type: QUERY PREHOOK: Input: default@t1 PREHOOK: Input: default@t1@ds=2010-04-17 #### A masked pattern was here #### -POSTHOOK: query: select * from T1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from T1 POSTHOOK: type: QUERY POSTHOOK: Input: default@t1 POSTHOOK: Input: default@t1@ds=2010-04-17 #### A masked pattern was here #### 5 1 1 1 0 0 4 2010-04-17 -PREHOOK: query: select * from T3 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from T3 PREHOOK: type: QUERY PREHOOK: Input: default@t3 PREHOOK: Input: default@t3@ds=2010-04-17 #### A masked pattern was here #### -POSTHOOK: query: select * from T3 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from T3 POSTHOOK: type: QUERY POSTHOOK: Input: default@t3 POSTHOOK: Input: default@t3@ds=2010-04-17 #### A masked pattern was here #### 4 5 0 2010-04-17 -PREHOOK: query: select * from T4 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from T4 PREHOOK: type: QUERY PREHOOK: Input: default@t4 PREHOOK: Input: default@t4@ds=2010-04-17 #### A masked pattern was here #### -POSTHOOK: query: select * from T4 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from T4 POSTHOOK: type: QUERY POSTHOOK: Input: default@t4 POSTHOOK: Input: default@t4@ds=2010-04-17 #### A masked pattern was here #### 4 1 1 8 4 5 1 0 9 U 2 2 0 2 1 1 J C A U 2 s 2 NULL NULL NULL NULL NULL NULL 1 j S 6 NULL 1 2 J g 1 e 2 1 2 U P p 3 0 0 0 1 1 1 0 0 0 6 2 j NULL NULL NULL NULL NULL NULL 5 NULL NULL j 2 2 1 2 2 1 1 1 1 1 1 1 1 32 NULL 2010-04-17 WARNING: Comparing a bigint and a string may result in a loss of precision. -PREHOOK: query: SELECT a.c1 as a_c1, b.c1 b_c1, d.c0 as d_c0 +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT a.c1 as a_c1, b.c1 b_c1, d.c0 as d_c0 FROM T1 a JOIN T2 b ON (a.c1 = b.c1 AND a.ds='2010-04-17' AND b.ds='2010-04-17') JOIN T3 c @@ -248,7 +273,8 @@ PREHOOK: Input: default@t3@ds=2010-04-17 PREHOOK: Input: default@t4 PREHOOK: Input: default@t4@ds=2010-04-17 #### A masked pattern was here #### -POSTHOOK: query: SELECT a.c1 as a_c1, b.c1 b_c1, d.c0 as d_c0 +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT a.c1 as a_c1, b.c1 b_c1, d.c0 as d_c0 FROM T1 a JOIN T2 b ON (a.c1 = b.c1 AND a.ds='2010-04-17' AND b.ds='2010-04-17') JOIN T3 c diff --git a/ql/src/test/results/clientpositive/spark/groupby3_map_multi_distinct.q.out b/ql/src/test/results/clientpositive/spark/groupby3_map_multi_distinct.q.out index 5e9d229..2d7cc19 100644 --- a/ql/src/test/results/clientpositive/spark/groupby3_map_multi_distinct.q.out +++ b/ql/src/test/results/clientpositive/spark/groupby3_map_multi_distinct.q.out @@ -152,4 +152,4 @@ POSTHOOK: query: SELECT dest1.* FROM dest1 POSTHOOK: type: QUERY POSTHOOK: Input: default@dest1 #### A masked pattern was here #### -130091.0 260.182 256.10355987055016 98.0 0.0 142.9268095075238 143.06995106518906 20428.072876 20469.01089779559 79136.0 309.0 +130091.0 260.182 256.10355987055016 98.0 0.0 142.92680950752379 143.06995106518903 20428.072875999995 20469.010897795586 79136.0 309.0 diff --git a/ql/src/test/results/clientpositive/spark/insert_into1.q.out b/ql/src/test/results/clientpositive/spark/insert_into1.q.out index e7f7d8f..47dfbba 100644 --- a/ql/src/test/results/clientpositive/spark/insert_into1.q.out +++ b/ql/src/test/results/clientpositive/spark/insert_into1.q.out @@ -10,9 +10,11 @@ POSTHOOK: query: CREATE TABLE insert_into1 (key int, value string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@insert_into1 -PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * from src LIMIT 100 +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN INSERT INTO TABLE insert_into1 SELECT * from src ORDER BY key LIMIT 100 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * from src LIMIT 100 +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN INSERT INTO TABLE insert_into1 SELECT * from src ORDER BY key LIMIT 100 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -23,7 +25,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 1) + Reducer 2 <- Map 1 (SORT, 1) #### A masked pattern was here #### Vertices: Map 1 @@ -35,19 +37,17 @@ STAGE PLANS: expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE - Limit - Number of rows: 100 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - sort order: - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: string), _col1 (type: string) + Reduce Output Operator + key expressions: _col0 (type: string) + sort order: + + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: string) Reducer 2 Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: string), VALUE._col1 (type: string) + expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 100 Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE @@ -77,11 +77,11 @@ STAGE PLANS: Stage: Stage-2 Stats-Aggr Operator -PREHOOK: query: INSERT INTO TABLE insert_into1 SELECT * from src LIMIT 100 +PREHOOK: query: INSERT INTO TABLE insert_into1 SELECT * from src ORDER BY key LIMIT 100 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@insert_into1 -POSTHOOK: query: INSERT INTO TABLE insert_into1 SELECT * from src LIMIT 100 +POSTHOOK: query: INSERT INTO TABLE insert_into1 SELECT * from src ORDER BY key LIMIT 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@insert_into1 @@ -99,7 +99,7 @@ POSTHOOK: query: SELECT SUM(HASH(c)) FROM ( POSTHOOK: type: QUERY POSTHOOK: Input: default@insert_into1 #### A masked pattern was here #### -10226524244 +-1142373758 PREHOOK: query: explain select count(*) from insert_into1 PREHOOK: type: QUERY @@ -125,9 +125,9 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@insert_into1 #### A masked pattern was here #### 100 -PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src LIMIT 100 +PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 100 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src LIMIT 100 +POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 100 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -138,7 +138,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 1) + Reducer 2 <- Map 1 (SORT, 1) #### A masked pattern was here #### Vertices: Map 1 @@ -150,19 +150,17 @@ STAGE PLANS: expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE - Limit - Number of rows: 100 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - sort order: - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: string), _col1 (type: string) + Reduce Output Operator + key expressions: _col0 (type: string) + sort order: + + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: string) Reducer 2 Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: string), VALUE._col1 (type: string) + expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 100 Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE @@ -192,11 +190,11 @@ STAGE PLANS: Stage: Stage-2 Stats-Aggr Operator -PREHOOK: query: INSERT INTO TABLE insert_into1 SELECT * FROM src LIMIT 100 +PREHOOK: query: INSERT INTO TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 100 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@insert_into1 -POSTHOOK: query: INSERT INTO TABLE insert_into1 SELECT * FROM src LIMIT 100 +POSTHOOK: query: INSERT INTO TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@insert_into1 @@ -214,7 +212,7 @@ POSTHOOK: query: SELECT SUM(HASH(c)) FROM ( POSTHOOK: type: QUERY POSTHOOK: Input: default@insert_into1 #### A masked pattern was here #### -20453048488 +-2284747516 PREHOOK: query: explain SELECT COUNT(*) FROM insert_into1 PREHOOK: type: QUERY @@ -240,9 +238,9 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@insert_into1 #### A masked pattern was here #### 200 -PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src LIMIT 10 +PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 10 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src LIMIT 10 +POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 10 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -253,7 +251,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 1) + Reducer 2 <- Map 1 (SORT, 1) #### A masked pattern was here #### Vertices: Map 1 @@ -265,19 +263,17 @@ STAGE PLANS: expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE - Limit - Number of rows: 10 - Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - sort order: - Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: string), _col1 (type: string) + Reduce Output Operator + key expressions: _col0 (type: string) + sort order: + + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: string) Reducer 2 Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: string), VALUE._col1 (type: string) + expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 10 Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE Column stats: NONE @@ -307,11 +303,11 @@ STAGE PLANS: Stage: Stage-2 Stats-Aggr Operator -PREHOOK: query: INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src LIMIT 10 +PREHOOK: query: INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 10 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@insert_into1 -POSTHOOK: query: INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src LIMIT 10 +POSTHOOK: query: INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 10 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@insert_into1 @@ -329,7 +325,7 @@ POSTHOOK: query: SELECT SUM(HASH(c)) FROM ( POSTHOOK: type: QUERY POSTHOOK: Input: default@insert_into1 #### A masked pattern was here #### --826625916 +-2693537120 PREHOOK: query: explain SELECT COUNT(*) FROM insert_into1 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/spark/insert_into2.q.out b/ql/src/test/results/clientpositive/spark/insert_into2.q.out index 8c5e1c3..578fae2 100644 --- a/ql/src/test/results/clientpositive/spark/insert_into2.q.out +++ b/ql/src/test/results/clientpositive/spark/insert_into2.q.out @@ -13,10 +13,10 @@ POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@insert_into2 PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into2 PARTITION (ds='1') - SELECT * FROM src LIMIT 100 + SELECT * FROM src order by key LIMIT 100 PREHOOK: type: QUERY POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into2 PARTITION (ds='1') - SELECT * FROM src LIMIT 100 + SELECT * FROM src order by key LIMIT 100 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -27,7 +27,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 1) + Reducer 2 <- Map 1 (SORT, 1) #### A masked pattern was here #### Vertices: Map 1 @@ -39,19 +39,17 @@ STAGE PLANS: expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE - Limit - Number of rows: 100 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - sort order: - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: string), _col1 (type: string) + Reduce Output Operator + key expressions: _col0 (type: string) + sort order: + + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: string) Reducer 2 Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: string), VALUE._col1 (type: string) + expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 100 Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE @@ -83,11 +81,11 @@ STAGE PLANS: Stage: Stage-2 Stats-Aggr Operator -PREHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src limit 100 +PREHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src order by key limit 100 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@insert_into2@ds=1 -POSTHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src limit 100 +POSTHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src order by key limit 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@insert_into2@ds=1 @@ -118,11 +116,11 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@insert_into2 #### A masked pattern was here #### 100 -PREHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src limit 100 +PREHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src order by key limit 100 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@insert_into2@ds=1 -POSTHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src limit 100 +POSTHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src order by key limit 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@insert_into2@ds=1 @@ -167,12 +165,12 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@insert_into2 POSTHOOK: Input: default@insert_into2@ds=1 #### A masked pattern was here #### --24159954504 +-39568181484 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 100 + SELECT * FROM src order by key LIMIT 100 PREHOOK: type: QUERY POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 100 + SELECT * FROM src order by key LIMIT 100 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -183,7 +181,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 1) + Reducer 2 <- Map 1 (SORT, 1) #### A masked pattern was here #### Vertices: Map 1 @@ -195,19 +193,17 @@ STAGE PLANS: expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE - Limit - Number of rows: 100 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - sort order: - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: string), _col1 (type: string) + Reduce Output Operator + key expressions: _col0 (type: string) + sort order: + + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: string) Reducer 2 Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: string), VALUE._col1 (type: string) + expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 100 Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE @@ -240,12 +236,12 @@ STAGE PLANS: Stats-Aggr Operator PREHOOK: query: INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 100 + SELECT * FROM src order by key LIMIT 100 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@insert_into2@ds=2 POSTHOOK: query: INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 100 + SELECT * FROM src order by key LIMIT 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@insert_into2@ds=2 @@ -267,7 +263,7 @@ POSTHOOK: Input: default@insert_into2 POSTHOOK: Input: default@insert_into2@ds=1 POSTHOOK: Input: default@insert_into2@ds=2 #### A masked pattern was here #### --36239931656 +-59352272126 PREHOOK: query: explain SELECT COUNT(*) FROM insert_into2 WHERE ds='2' PREHOOK: type: QUERY @@ -294,10 +290,10 @@ POSTHOOK: Input: default@insert_into2 #### A masked pattern was here #### 100 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 50 + SELECT * FROM src order by key LIMIT 50 PREHOOK: type: QUERY POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 50 + SELECT * FROM src order by key LIMIT 50 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -308,7 +304,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 1) + Reducer 2 <- Map 1 (SORT, 1) #### A masked pattern was here #### Vertices: Map 1 @@ -320,19 +316,17 @@ STAGE PLANS: expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE - Limit - Number of rows: 50 - Statistics: Num rows: 50 Data size: 500 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - sort order: - Statistics: Num rows: 50 Data size: 500 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: string), _col1 (type: string) + Reduce Output Operator + key expressions: _col0 (type: string) + sort order: + + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: string) Reducer 2 Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: string), VALUE._col1 (type: string) + expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 50 Data size: 500 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 50 Statistics: Num rows: 50 Data size: 500 Basic stats: COMPLETE Column stats: NONE @@ -365,12 +359,12 @@ STAGE PLANS: Stats-Aggr Operator PREHOOK: query: INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 50 + SELECT * FROM src order by key LIMIT 50 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@insert_into2@ds=2 POSTHOOK: query: INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 50 + SELECT * FROM src order by key LIMIT 50 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@insert_into2@ds=2 @@ -392,7 +386,7 @@ POSTHOOK: Input: default@insert_into2 POSTHOOK: Input: default@insert_into2@ds=1 POSTHOOK: Input: default@insert_into2@ds=2 #### A masked pattern was here #### --27100860056 +-33609711132 PREHOOK: query: explain SELECT COUNT(*) FROM insert_into2 WHERE ds='2' PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/spark/join1.q.out b/ql/src/test/results/clientpositive/spark/join1.q.out index 145bbe4..2ac6000 100644 --- a/ql/src/test/results/clientpositive/spark/join1.q.out +++ b/ql/src/test/results/clientpositive/spark/join1.q.out @@ -10,11 +10,13 @@ CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value POSTHOOK: type: QUERY @@ -93,23 +95,27 @@ STAGE PLANS: Stage: Stage-2 Stats-Aggr Operator -PREHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key) +PREHOOK: query: -- SORT_QUERY_RESULTS +FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@dest_j1 -POSTHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key) +POSTHOOK: query: -- SORT_QUERY_RESULTS +FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@dest_j1 POSTHOOK: Lineage: dest_j1.key EXPRESSION [(src)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: dest_j1.value SIMPLE [(src)src2.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: SELECT dest_j1.* FROM dest_j1 +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT dest_j1.* FROM dest_j1 PREHOOK: type: QUERY PREHOOK: Input: default@dest_j1 #### A masked pattern was here #### -POSTHOOK: query: SELECT dest_j1.* FROM dest_j1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT dest_j1.* FROM dest_j1 POSTHOOK: type: QUERY POSTHOOK: Input: default@dest_j1 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/join_nullsafe.q.out b/ql/src/test/results/clientpositive/spark/join_nullsafe.q.out index 96db301..4d62454 100644 --- a/ql/src/test/results/clientpositive/spark/join_nullsafe.q.out +++ b/ql/src/test/results/clientpositive/spark/join_nullsafe.q.out @@ -19,9 +19,11 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@myinput1 PREHOOK: query: -- merging +-- SORT_QUERY_RESULTS explain select * from myinput1 a join myinput1 b on a.key<=>b.value PREHOOK: type: QUERY POSTHOOK: query: -- merging +-- SORT_QUERY_RESULTS explain select * from myinput1 a join myinput1 b on a.key<=>b.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -86,11 +88,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value PREHOOK: type: QUERY PREHOOK: Input: default@myinput1 #### A masked pattern was here #### -POSTHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@myinput1 #### A masked pattern was here #### @@ -105,9 +109,11 @@ NULL 35 NULL NULL NULL NULL 10 NULL NULL NULL 48 NULL NULL NULL NULL NULL -PREHOOK: query: explain select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key=c.key +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key=c.key PREHOOK: type: QUERY -POSTHOOK: query: explain select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key=c.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key=c.key POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -192,19 +198,23 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key=c.key +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key=c.key PREHOOK: type: QUERY PREHOOK: Input: default@myinput1 #### A masked pattern was here #### -POSTHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key=c.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key=c.key POSTHOOK: type: QUERY POSTHOOK: Input: default@myinput1 #### A masked pattern was here #### 10 NULL NULL 10 10 NULL 100 100 100 100 100 100 -PREHOOK: query: explain select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key<=>c.key +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key<=>c.key PREHOOK: type: QUERY -POSTHOOK: query: explain select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key<=>c.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key<=>c.key POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -281,11 +291,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key<=>c.key +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key<=>c.key PREHOOK: type: QUERY PREHOOK: Input: default@myinput1 #### A masked pattern was here #### -POSTHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key<=>c.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value join myinput1 c on a.key<=>c.key POSTHOOK: type: QUERY POSTHOOK: Input: default@myinput1 #### A masked pattern was here #### @@ -318,9 +330,11 @@ NULL NULL 48 NULL NULL NULL NULL NULL NULL NULL NULL 10 NULL NULL NULL NULL NULL 35 NULL NULL NULL NULL NULL NULL -PREHOOK: query: explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value=b.key join myinput1 c on a.key<=>c.key AND a.value=c.value +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value=b.key join myinput1 c on a.key<=>c.key AND a.value=c.value PREHOOK: type: QUERY -POSTHOOK: query: explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value=b.key join myinput1 c on a.key<=>c.key AND a.value=c.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value=b.key join myinput1 c on a.key<=>c.key AND a.value=c.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -403,19 +417,23 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value=b.key join myinput1 c on a.key<=>c.key AND a.value=c.value +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value=b.key join myinput1 c on a.key<=>c.key AND a.value=c.value PREHOOK: type: QUERY PREHOOK: Input: default@myinput1 #### A masked pattern was here #### -POSTHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value=b.key join myinput1 c on a.key<=>c.key AND a.value=c.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value=b.key join myinput1 c on a.key<=>c.key AND a.value=c.value POSTHOOK: type: QUERY POSTHOOK: Input: default@myinput1 #### A masked pattern was here #### 100 100 100 100 100 100 NULL 10 10 NULL NULL 10 -PREHOOK: query: explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value<=>b.key join myinput1 c on a.key<=>c.key AND a.value<=>c.value +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value<=>b.key join myinput1 c on a.key<=>c.key AND a.value<=>c.value PREHOOK: type: QUERY -POSTHOOK: query: explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value<=>b.key join myinput1 c on a.key<=>c.key AND a.value<=>c.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value<=>b.key join myinput1 c on a.key<=>c.key AND a.value<=>c.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -489,11 +507,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value<=>b.key join myinput1 c on a.key<=>c.key AND a.value<=>c.value +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value<=>b.key join myinput1 c on a.key<=>c.key AND a.value<=>c.value PREHOOK: type: QUERY PREHOOK: Input: default@myinput1 #### A masked pattern was here #### -POSTHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value<=>b.key join myinput1 c on a.key<=>c.key AND a.value<=>c.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.value<=>b.key join myinput1 c on a.key<=>c.key AND a.value<=>c.value POSTHOOK: type: QUERY POSTHOOK: Input: default@myinput1 #### A masked pattern was here #### @@ -502,11 +522,13 @@ POSTHOOK: Input: default@myinput1 NULL 10 10 NULL NULL 10 NULL NULL NULL NULL NULL NULL PREHOOK: query: -- outer joins +-- SORT_QUERY_RESULTS SELECT * FROM myinput1 a LEFT OUTER JOIN myinput1 b ON a.key<=>b.value PREHOOK: type: QUERY PREHOOK: Input: default@myinput1 #### A masked pattern was here #### POSTHOOK: query: -- outer joins +-- SORT_QUERY_RESULTS SELECT * FROM myinput1 a LEFT OUTER JOIN myinput1 b ON a.key<=>b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@myinput1 @@ -523,11 +545,13 @@ NULL 35 NULL NULL NULL NULL 10 NULL NULL NULL 48 NULL NULL NULL NULL NULL -PREHOOK: query: SELECT * FROM myinput1 a RIGHT OUTER JOIN myinput1 b ON a.key<=>b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM myinput1 a RIGHT OUTER JOIN myinput1 b ON a.key<=>b.value PREHOOK: type: QUERY PREHOOK: Input: default@myinput1 #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM myinput1 a RIGHT OUTER JOIN myinput1 b ON a.key<=>b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM myinput1 a RIGHT OUTER JOIN myinput1 b ON a.key<=>b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@myinput1 #### A masked pattern was here #### @@ -543,11 +567,13 @@ NULL NULL 10 NULL NULL NULL 48 NULL NULL NULL NULL 35 NULL NULL NULL NULL -PREHOOK: query: SELECT * FROM myinput1 a FULL OUTER JOIN myinput1 b ON a.key<=>b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM myinput1 a FULL OUTER JOIN myinput1 b ON a.key<=>b.value PREHOOK: type: QUERY PREHOOK: Input: default@myinput1 #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM myinput1 a FULL OUTER JOIN myinput1 b ON a.key<=>b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM myinput1 a FULL OUTER JOIN myinput1 b ON a.key<=>b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@myinput1 #### A masked pattern was here #### @@ -565,11 +591,13 @@ NULL NULL 48 NULL NULL NULL NULL 35 NULL NULL NULL NULL PREHOOK: query: -- map joins +-- SORT_QUERY_RESULTS SELECT /*+ MAPJOIN(a) */ * FROM myinput1 a JOIN myinput1 b ON a.key<=>b.value PREHOOK: type: QUERY PREHOOK: Input: default@myinput1 #### A masked pattern was here #### POSTHOOK: query: -- map joins +-- SORT_QUERY_RESULTS SELECT /*+ MAPJOIN(a) */ * FROM myinput1 a JOIN myinput1 b ON a.key<=>b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@myinput1 @@ -585,11 +613,13 @@ NULL 35 NULL NULL NULL NULL 10 NULL NULL NULL 48 NULL NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM myinput1 a JOIN myinput1 b ON a.key<=>b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM myinput1 a JOIN myinput1 b ON a.key<=>b.value PREHOOK: type: QUERY PREHOOK: Input: default@myinput1 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM myinput1 a JOIN myinput1 b ON a.key<=>b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM myinput1 a JOIN myinput1 b ON a.key<=>b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@myinput1 #### A masked pattern was here #### @@ -664,11 +694,13 @@ POSTHOOK: Lineage: smb_input1.key SIMPLE [(smb_input)smb_input.FieldSchema(name: POSTHOOK: Lineage: smb_input1.value SIMPLE [(smb_input)smb_input.FieldSchema(name:value, type:int, comment:null), ] POSTHOOK: Lineage: smb_input2.key SIMPLE [(smb_input)smb_input.FieldSchema(name:key, type:int, comment:null), ] POSTHOOK: Lineage: smb_input2.value SIMPLE [(smb_input)smb_input.FieldSchema(name:value, type:int, comment:null), ] -PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key PREHOOK: type: QUERY PREHOOK: Input: default@smb_input1 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input1 #### A masked pattern was here #### @@ -726,11 +758,13 @@ NULL 35 NULL NULL NULL NULL NULL 10050 NULL NULL NULL 35 NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key AND a.value <=> b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key AND a.value <=> b.value PREHOOK: type: QUERY PREHOOK: Input: default@smb_input1 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key AND a.value <=> b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key AND a.value <=> b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input1 #### A masked pattern was here #### @@ -776,11 +810,13 @@ POSTHOOK: Input: default@smb_input1 NULL 10050 NULL 10050 NULL 35 NULL 35 NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a RIGHT OUTER JOIN smb_input1 b ON a.key <=> b.key +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a RIGHT OUTER JOIN smb_input1 b ON a.key <=> b.key PREHOOK: type: QUERY PREHOOK: Input: default@smb_input1 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a RIGHT OUTER JOIN smb_input1 b ON a.key <=> b.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a RIGHT OUTER JOIN smb_input1 b ON a.key <=> b.key POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input1 #### A masked pattern was here #### @@ -838,11 +874,13 @@ NULL 35 NULL NULL NULL NULL NULL 10050 NULL NULL NULL 35 NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key PREHOOK: type: QUERY PREHOOK: Input: default@smb_input1 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a JOIN smb_input1 b ON a.key <=> b.key POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input1 #### A masked pattern was here #### @@ -900,11 +938,13 @@ NULL 35 NULL NULL NULL NULL NULL 10050 NULL NULL NULL 35 NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a LEFT OUTER JOIN smb_input1 b ON a.key <=> b.key +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a LEFT OUTER JOIN smb_input1 b ON a.key <=> b.key PREHOOK: type: QUERY PREHOOK: Input: default@smb_input1 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a LEFT OUTER JOIN smb_input1 b ON a.key <=> b.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a LEFT OUTER JOIN smb_input1 b ON a.key <=> b.key POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input1 #### A masked pattern was here #### @@ -962,12 +1002,14 @@ NULL 35 NULL NULL NULL NULL NULL 10050 NULL NULL NULL 35 NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input2 b ON a.key <=> b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input2 b ON a.key <=> b.value PREHOOK: type: QUERY PREHOOK: Input: default@smb_input1 PREHOOK: Input: default@smb_input2 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input2 b ON a.key <=> b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a JOIN smb_input2 b ON a.key <=> b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input1 POSTHOOK: Input: default@smb_input2 @@ -983,12 +1025,14 @@ NULL 35 12 NULL NULL 35 NULL NULL NULL NULL 12 NULL NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a JOIN smb_input2 b ON a.key <=> b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a JOIN smb_input2 b ON a.key <=> b.value PREHOOK: type: QUERY PREHOOK: Input: default@smb_input1 PREHOOK: Input: default@smb_input2 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a JOIN smb_input2 b ON a.key <=> b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a JOIN smb_input2 b ON a.key <=> b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input1 POSTHOOK: Input: default@smb_input2 @@ -1004,12 +1048,14 @@ NULL 35 12 NULL NULL 35 NULL NULL NULL NULL 12 NULL NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a LEFT OUTER JOIN smb_input2 b ON a.key <=> b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a LEFT OUTER JOIN smb_input2 b ON a.key <=> b.value PREHOOK: type: QUERY PREHOOK: Input: default@smb_input1 PREHOOK: Input: default@smb_input2 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a LEFT OUTER JOIN smb_input2 b ON a.key <=> b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input1 a LEFT OUTER JOIN smb_input2 b ON a.key <=> b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input1 POSTHOOK: Input: default@smb_input2 @@ -1046,12 +1092,14 @@ NULL 35 12 NULL NULL 35 NULL NULL NULL NULL 12 NULL NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a RIGHT OUTER JOIN smb_input2 b ON a.key <=> b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a RIGHT OUTER JOIN smb_input2 b ON a.key <=> b.value PREHOOK: type: QUERY PREHOOK: Input: default@smb_input1 PREHOOK: Input: default@smb_input2 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a RIGHT OUTER JOIN smb_input2 b ON a.key <=> b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input1 a RIGHT OUTER JOIN smb_input2 b ON a.key <=> b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input1 POSTHOOK: Input: default@smb_input2 @@ -1086,11 +1134,13 @@ NULL NULL 80 10040 NULL NULL 80 10040 NULL NULL NULL 10050 NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input2 a JOIN smb_input2 b ON a.value <=> b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input2 a JOIN smb_input2 b ON a.value <=> b.value PREHOOK: type: QUERY PREHOOK: Input: default@smb_input2 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input2 a JOIN smb_input2 b ON a.value <=> b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input2 a JOIN smb_input2 b ON a.value <=> b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input2 #### A masked pattern was here #### @@ -1202,11 +1252,13 @@ NULL 10050 NULL 10050 NULL 35 NULL 35 NULL NULL 12 NULL NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input2 a RIGHT OUTER JOIN smb_input2 b ON a.value <=> b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input2 a RIGHT OUTER JOIN smb_input2 b ON a.value <=> b.value PREHOOK: type: QUERY PREHOOK: Input: default@smb_input2 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(a) */ * FROM smb_input2 a RIGHT OUTER JOIN smb_input2 b ON a.value <=> b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(a) */ * FROM smb_input2 a RIGHT OUTER JOIN smb_input2 b ON a.value <=> b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input2 #### A masked pattern was here #### @@ -1318,11 +1370,13 @@ NULL 10050 NULL 10050 NULL 35 NULL 35 NULL NULL 12 NULL NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input2 a JOIN smb_input2 b ON a.value <=> b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input2 a JOIN smb_input2 b ON a.value <=> b.value PREHOOK: type: QUERY PREHOOK: Input: default@smb_input2 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input2 a JOIN smb_input2 b ON a.value <=> b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input2 a JOIN smb_input2 b ON a.value <=> b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input2 #### A masked pattern was here #### @@ -1434,11 +1488,13 @@ NULL 10050 NULL 10050 NULL 35 NULL 35 NULL NULL 12 NULL NULL NULL NULL NULL -PREHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input2 a LEFT OUTER JOIN smb_input2 b ON a.value <=> b.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input2 a LEFT OUTER JOIN smb_input2 b ON a.value <=> b.value PREHOOK: type: QUERY PREHOOK: Input: default@smb_input2 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ MAPJOIN(b) */ * FROM smb_input2 a LEFT OUTER JOIN smb_input2 b ON a.value <=> b.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ MAPJOIN(b) */ * FROM smb_input2 a LEFT OUTER JOIN smb_input2 b ON a.value <=> b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@smb_input2 #### A masked pattern was here #### @@ -1551,9 +1607,11 @@ NULL 35 NULL 35 NULL NULL 12 NULL NULL NULL NULL NULL PREHOOK: query: --HIVE-3315 join predicate transitive +-- SORT_QUERY_RESULTS explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.key is NULL PREHOOK: type: QUERY POSTHOOK: query: --HIVE-3315 join predicate transitive +-- SORT_QUERY_RESULTS explain select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.key is NULL POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -1624,11 +1682,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.key is NULL +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.key is NULL PREHOOK: type: QUERY PREHOOK: Input: default@myinput1 #### A masked pattern was here #### -POSTHOOK: query: select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.key is NULL +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from myinput1 a join myinput1 b on a.key<=>b.value AND a.key is NULL POSTHOOK: type: QUERY POSTHOOK: Input: default@myinput1 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/mapjoin_decimal.q.out b/ql/src/test/results/clientpositive/spark/mapjoin_decimal.q.out index 3fafe1f..20b188b 100644 --- a/ql/src/test/results/clientpositive/spark/mapjoin_decimal.q.out +++ b/ql/src/test/results/clientpositive/spark/mapjoin_decimal.q.out @@ -77,10 +77,10 @@ POSTHOOK: Input: default@over1k POSTHOOK: Output: default@t2 POSTHOOK: Lineage: t2.dec EXPRESSION [(over1k)over1k.FieldSchema(name:dec, type:decimal(4,2), comment:null), ] PREHOOK: query: 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 PREHOOK: type: QUERY POSTHOOK: query: 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 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-2 is a root stage @@ -92,7 +92,7 @@ STAGE PLANS: Spark #### A masked pattern was here #### Vertices: - Map 2 + Map 3 Map Operator Tree: TableScan alias: t2 @@ -109,6 +109,8 @@ STAGE PLANS: Stage: Stage-1 Spark + Edges: + Reducer 2 <- Map 1 (SORT, 1) #### A masked pattern was here #### Vertices: Map 1 @@ -127,21 +129,32 @@ STAGE PLANS: 1 dec (type: decimal(6,2)) outputColumnNames: _col0, _col4 input vertices: - 1 Map 2 + 1 Map 3 Statistics: Num rows: 577 Data size: 64680 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: _col0 (type: decimal(4,2)), _col4 (type: decimal(4,0)) outputColumnNames: _col0, _col1 Statistics: Num rows: 577 Data size: 64680 Basic stats: COMPLETE Column stats: NONE - File Output Operator - compressed: false + Reduce Output Operator + key expressions: _col0 (type: decimal(4,2)) + sort order: + Statistics: Num rows: 577 Data size: 64680 Basic stats: COMPLETE Column stats: NONE - table: - input format: org.apache.hadoop.mapred.TextInputFormat - output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + value expressions: _col1 (type: decimal(4,0)) Local Work: Map Reduce Local Work + Reducer 2 + Reduce Operator Tree: + Select Operator + expressions: KEY.reducesinkkey0 (type: decimal(4,2)), VALUE._col0 (type: decimal(4,0)) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 577 Data size: 64680 Basic stats: COMPLETE Column stats: NONE + File Output Operator + compressed: false + Statistics: Num rows: 577 Data size: 64680 Basic stats: COMPLETE Column stats: NONE + table: + input format: org.apache.hadoop.mapred.TextInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Stage: Stage-0 Fetch Operator @@ -149,12 +162,12 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) +PREHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec PREHOOK: type: QUERY PREHOOK: Input: default@t1 PREHOOK: Input: default@t2 #### A masked pattern was here #### -POSTHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) +POSTHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec POSTHOOK: type: QUERY POSTHOOK: Input: default@t1 POSTHOOK: Input: default@t2 @@ -265,12 +278,12 @@ POSTHOOK: Input: default@t2 9 9 9 9 9 9 -PREHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) +PREHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec PREHOOK: type: QUERY PREHOOK: Input: default@t1 PREHOOK: Input: default@t2 #### A masked pattern was here #### -POSTHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) +POSTHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec POSTHOOK: type: QUERY POSTHOOK: Input: default@t1 POSTHOOK: Input: default@t2 diff --git a/ql/src/test/results/clientpositive/spark/mapjoin_distinct.q.out b/ql/src/test/results/clientpositive/spark/mapjoin_distinct.q.out index 662fdaf..70c0925 100644 --- a/ql/src/test/results/clientpositive/spark/mapjoin_distinct.q.out +++ b/ql/src/test/results/clientpositive/spark/mapjoin_distinct.q.out @@ -38,8 +38,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -173,7 +173,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -295,8 +295,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -425,7 +425,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/mapjoin_filter_on_outerjoin.q.out b/ql/src/test/results/clientpositive/spark/mapjoin_filter_on_outerjoin.q.out index b68dfb4..7710080 100644 --- a/ql/src/test/results/clientpositive/spark/mapjoin_filter_on_outerjoin.q.out +++ b/ql/src/test/results/clientpositive/spark/mapjoin_filter_on_outerjoin.q.out @@ -108,7 +108,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 3 @@ -269,7 +269,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 3 diff --git a/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out b/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out index 7089004..52434b5 100644 --- a/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out @@ -472,10 +472,12 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -581,10 +583,12 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -637,7 +641,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -716,7 +720,8 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' +PREHOOK: query: -- SORT_QUERY_RESULTS +select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@src1 @@ -726,7 +731,8 @@ PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### -POSTHOOK: query: select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' +POSTHOOK: query: -- SORT_QUERY_RESULTS +select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@src1 @@ -756,7 +762,8 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 98 98 98 -PREHOOK: query: select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds +PREHOOK: query: -- SORT_QUERY_RESULTS +select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@srcpart @@ -765,7 +772,8 @@ PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### -POSTHOOK: query: select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds +POSTHOOK: query: -- SORT_QUERY_RESULTS +select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@srcpart @@ -776,7 +784,8 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### 5308 5308 -PREHOOK: query: select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' +PREHOOK: query: -- SORT_QUERY_RESULTS +select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@src1 @@ -786,7 +795,8 @@ PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### -POSTHOOK: query: select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' +POSTHOOK: query: -- SORT_QUERY_RESULTS +select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@src1 @@ -816,7 +826,8 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 98 98 98 -PREHOOK: query: select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds +PREHOOK: query: -- SORT_QUERY_RESULTS +select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@srcpart @@ -825,7 +836,8 @@ PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### -POSTHOOK: query: select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds +POSTHOOK: query: -- SORT_QUERY_RESULTS +select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@srcpart diff --git a/ql/src/test/results/clientpositive/spark/mapjoin_test_outer.q.out b/ql/src/test/results/clientpositive/spark/mapjoin_test_outer.q.out index 6845b4c..e87b1f4 100644 --- a/ql/src/test/results/clientpositive/spark/mapjoin_test_outer.q.out +++ b/ql/src/test/results/clientpositive/spark/mapjoin_test_outer.q.out @@ -285,7 +285,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 3 @@ -1115,7 +1115,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 3 <- Map 2 (PARTITION-LEVEL SORT, 2) + Reducer 3 <- Map 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 2 diff --git a/ql/src/test/results/clientpositive/spark/mapreduce1.q.out b/ql/src/test/results/clientpositive/spark/mapreduce1.q.out index d75b482..40b1226 100644 --- a/ql/src/test/results/clientpositive/spark/mapreduce1.q.out +++ b/ql/src/test/results/clientpositive/spark/mapreduce1.q.out @@ -31,7 +31,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/mapreduce2.q.out b/ql/src/test/results/clientpositive/spark/mapreduce2.q.out index adfb503..d8b6166 100644 --- a/ql/src/test/results/clientpositive/spark/mapreduce2.q.out +++ b/ql/src/test/results/clientpositive/spark/mapreduce2.q.out @@ -29,7 +29,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/merge1.q.out b/ql/src/test/results/clientpositive/spark/merge1.q.out index 41acbdb..3f4af46 100644 --- a/ql/src/test/results/clientpositive/spark/merge1.q.out +++ b/ql/src/test/results/clientpositive/spark/merge1.q.out @@ -32,7 +32,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/merge2.q.out b/ql/src/test/results/clientpositive/spark/merge2.q.out index edeebb7..3965a01 100644 --- a/ql/src/test/results/clientpositive/spark/merge2.q.out +++ b/ql/src/test/results/clientpositive/spark/merge2.q.out @@ -32,7 +32,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/mergejoins.q.out b/ql/src/test/results/clientpositive/spark/mergejoins.q.out index 86ee699..d8335e0 100644 --- a/ql/src/test/results/clientpositive/spark/mergejoins.q.out +++ b/ql/src/test/results/clientpositive/spark/mergejoins.q.out @@ -50,8 +50,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Map 7 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Map 7 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -186,7 +186,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/mergejoins_mixed.q.out b/ql/src/test/results/clientpositive/spark/mergejoins_mixed.q.out index 8dcf5ac..505431b 100644 --- a/ql/src/test/results/clientpositive/spark/mergejoins_mixed.q.out +++ b/ql/src/test/results/clientpositive/spark/mergejoins_mixed.q.out @@ -26,7 +26,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -119,7 +119,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -212,7 +212,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -305,7 +305,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -400,8 +400,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -508,8 +508,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -616,8 +616,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -726,9 +726,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Map 6 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Map 7 (PARTITION-LEVEL SORT, 2), Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Map 6 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Map 7 (PARTITION-LEVEL SORT, 4), Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -855,9 +855,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Map 6 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Map 7 (PARTITION-LEVEL SORT, 2), Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Map 6 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Map 7 (PARTITION-LEVEL SORT, 4), Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -984,9 +984,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Map 6 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Map 7 (PARTITION-LEVEL SORT, 2), Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Map 6 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Map 7 (PARTITION-LEVEL SORT, 4), Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1113,9 +1113,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Map 6 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Map 7 (PARTITION-LEVEL SORT, 2), Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Map 6 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Map 7 (PARTITION-LEVEL SORT, 4), Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1244,8 +1244,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/multi_insert.q.out b/ql/src/test/results/clientpositive/spark/multi_insert.q.out index 137082a..186c8ba 100644 --- a/ql/src/test/results/clientpositive/spark/multi_insert.q.out +++ b/ql/src/test/results/clientpositive/spark/multi_insert.q.out @@ -587,7 +587,7 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -733,7 +733,7 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -879,7 +879,7 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1025,7 +1025,7 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/multi_insert_gby.q.out b/ql/src/test/results/clientpositive/spark/multi_insert_gby.q.out index 6eae46e..4eae8f2 100644 --- a/ql/src/test/results/clientpositive/spark/multi_insert_gby.q.out +++ b/ql/src/test/results/clientpositive/spark/multi_insert_gby.q.out @@ -43,7 +43,7 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -230,7 +230,7 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/multi_insert_gby3.q.out b/ql/src/test/results/clientpositive/spark/multi_insert_gby3.q.out index 588d54a..f9b6290 100644 --- a/ql/src/test/results/clientpositive/spark/multi_insert_gby3.q.out +++ b/ql/src/test/results/clientpositive/spark/multi_insert_gby3.q.out @@ -50,7 +50,7 @@ STAGE PLANS: Spark Edges: Reducer 2 <- Map 1 (SORT, 1) - Reducer 3 <- Reducer 2 (GROUP PARTITION-LEVEL SORT, 2) + Reducer 3 <- Reducer 2 (GROUP PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -172,7 +172,7 @@ STAGE PLANS: Spark Edges: Reducer 2 <- Map 1 (SORT, 1) - Reducer 3 <- Reducer 2 (GROUP PARTITION-LEVEL SORT, 2) + Reducer 3 <- Reducer 2 (GROUP PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1607,8 +1607,8 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 2 <- Map 4 (GROUP PARTITION-LEVEL SORT, 2) - Reducer 3 <- Map 5 (GROUP PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 4 (GROUP PARTITION-LEVEL SORT, 4) + Reducer 3 <- Map 5 (GROUP PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 4 @@ -1750,7 +1750,7 @@ STAGE PLANS: Spark Edges: Reducer 2 <- Map 1 (SORT, 1) - Reducer 3 <- Reducer 2 (GROUP PARTITION-LEVEL SORT, 2) + Reducer 3 <- Reducer 2 (GROUP PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/multi_insert_lateral_view.q.out b/ql/src/test/results/clientpositive/spark/multi_insert_lateral_view.q.out index 6dc5747..823f95c 100644 --- a/ql/src/test/results/clientpositive/spark/multi_insert_lateral_view.q.out +++ b/ql/src/test/results/clientpositive/spark/multi_insert_lateral_view.q.out @@ -291,8 +291,8 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 2 <- Map 4 (GROUP, 2) - Reducer 3 <- Map 5 (GROUP, 2) + Reducer 2 <- Map 4 (GROUP, 4) + Reducer 3 <- Map 5 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 4 @@ -539,8 +539,8 @@ STAGE PLANS: Stage: Stage-3 Spark Edges: - Reducer 2 <- Map 4 (GROUP, 2) - Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 4 (GROUP, 4) + Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 4 @@ -806,9 +806,9 @@ STAGE PLANS: Stage: Stage-3 Spark Edges: - Reducer 2 <- Map 5 (GROUP PARTITION-LEVEL SORT, 2) - Reducer 3 <- Map 6 (GROUP PARTITION-LEVEL SORT, 2) - Reducer 4 <- Map 7 (GROUP PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 5 (GROUP PARTITION-LEVEL SORT, 4) + Reducer 3 <- Map 6 (GROUP PARTITION-LEVEL SORT, 4) + Reducer 4 <- Map 7 (GROUP PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 5 @@ -1164,9 +1164,9 @@ STAGE PLANS: Stage: Stage-4 Spark Edges: - Reducer 2 <- Map 5 (GROUP PARTITION-LEVEL SORT, 2) - Reducer 3 <- Map 6 (GROUP PARTITION-LEVEL SORT, 2) - Reducer 4 <- Map 7 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 5 (GROUP PARTITION-LEVEL SORT, 4) + Reducer 3 <- Map 6 (GROUP PARTITION-LEVEL SORT, 4) + Reducer 4 <- Map 7 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 5 diff --git a/ql/src/test/results/clientpositive/spark/multi_insert_mixed.q.out b/ql/src/test/results/clientpositive/spark/multi_insert_mixed.q.out index fc38565..b0241ac 100644 --- a/ql/src/test/results/clientpositive/spark/multi_insert_mixed.q.out +++ b/ql/src/test/results/clientpositive/spark/multi_insert_mixed.q.out @@ -53,8 +53,8 @@ STAGE PLANS: Stage: Stage-3 Spark Edges: - Reducer 2 <- Map 6 (GROUP, 2) - Reducer 4 <- Map 7 (GROUP, 2) + Reducer 2 <- Map 6 (GROUP, 4) + Reducer 4 <- Map 7 (GROUP, 4) Reducer 3 <- Reducer 2 (SORT, 1) Reducer 5 <- Reducer 4 (SORT, 1) #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/multi_insert_move_tasks_share_dependencies.q.out b/ql/src/test/results/clientpositive/spark/multi_insert_move_tasks_share_dependencies.q.out index 4645a65..fd853ff 100644 --- a/ql/src/test/results/clientpositive/spark/multi_insert_move_tasks_share_dependencies.q.out +++ b/ql/src/test/results/clientpositive/spark/multi_insert_move_tasks_share_dependencies.q.out @@ -604,7 +604,7 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -754,7 +754,7 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -904,7 +904,7 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1054,7 +1054,7 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -2305,10 +2305,10 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 5 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 6 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 5 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 6 (PARTITION-LEVEL SORT, 2) + Reducer 5 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 6 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 5 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -2432,10 +2432,10 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 5 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 6 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 5 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 6 (PARTITION-LEVEL SORT, 2) + Reducer 5 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 6 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 5 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -2559,10 +2559,10 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 5 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 6 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 5 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 6 (PARTITION-LEVEL SORT, 2) + Reducer 5 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 6 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 5 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -2686,10 +2686,10 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 5 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 6 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 5 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 6 (PARTITION-LEVEL SORT, 2) + Reducer 5 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 6 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 5 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -2821,10 +2821,10 @@ STAGE PLANS: Stage: Stage-4 Spark Edges: - Reducer 5 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 6 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 5 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 6 (PARTITION-LEVEL SORT, 2) + Reducer 5 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 6 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 5 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -3059,10 +3059,10 @@ STAGE PLANS: Stage: Stage-4 Spark Edges: - Reducer 5 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 6 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 5 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 6 (PARTITION-LEVEL SORT, 2) + Reducer 5 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 6 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 5 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -3297,10 +3297,10 @@ STAGE PLANS: Stage: Stage-4 Spark Edges: - Reducer 5 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 6 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 5 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 6 (PARTITION-LEVEL SORT, 2) + Reducer 5 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 6 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 5 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -3535,10 +3535,10 @@ STAGE PLANS: Stage: Stage-4 Spark Edges: - Reducer 5 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 6 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 5 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 6 (PARTITION-LEVEL SORT, 2) + Reducer 5 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 6 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 5 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/multi_join_union.q.out b/ql/src/test/results/clientpositive/spark/multi_join_union.q.out index bda569d..02b35a3 100644 --- a/ql/src/test/results/clientpositive/spark/multi_join_union.q.out +++ b/ql/src/test/results/clientpositive/spark/multi_join_union.q.out @@ -80,7 +80,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/multigroupby_singlemr.q.out b/ql/src/test/results/clientpositive/spark/multigroupby_singlemr.q.out index c1480e3..0a64885 100644 --- a/ql/src/test/results/clientpositive/spark/multigroupby_singlemr.q.out +++ b/ql/src/test/results/clientpositive/spark/multigroupby_singlemr.q.out @@ -59,8 +59,8 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 2 <- Map 4 (GROUP, 2) - Reducer 3 <- Map 5 (GROUP, 2) + Reducer 2 <- Map 4 (GROUP, 4) + Reducer 3 <- Map 5 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 4 @@ -193,8 +193,8 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 2 <- Map 4 (GROUP, 2) - Reducer 3 <- Map 5 (GROUP, 2) + Reducer 2 <- Map 4 (GROUP, 4) + Reducer 3 <- Map 5 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 4 @@ -327,8 +327,8 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 2 <- Map 4 (GROUP, 2) - Reducer 3 <- Map 5 (GROUP, 2) + Reducer 2 <- Map 4 (GROUP, 4) + Reducer 3 <- Map 5 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 4 @@ -461,7 +461,7 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -571,9 +571,9 @@ STAGE PLANS: Stage: Stage-3 Spark Edges: - Reducer 2 <- Map 5 (GROUP, 2) - Reducer 3 <- Map 6 (GROUP, 2) - Reducer 4 <- Map 7 (GROUP, 2) + Reducer 2 <- Map 5 (GROUP, 4) + Reducer 3 <- Map 6 (GROUP, 4) + Reducer 4 <- Map 7 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 5 diff --git a/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out b/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out index b5eff31..eb8d624 100644 --- a/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out +++ b/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out @@ -103,7 +103,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -251,7 +251,7 @@ STAGE PLANS: Spark Edges: Reducer 4 <- Map 3 (GROUP, 1) - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Reducer 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Reducer 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1528,7 +1528,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 3 <- Map 2 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) + Reducer 3 <- Map 2 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1785,7 +1785,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.java1.7.out b/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.java1.7.out index 227886b..209a08a 100644 --- a/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.java1.7.out +++ b/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.java1.7.out @@ -114,7 +114,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -590,7 +590,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/parallel.q.out b/ql/src/test/results/clientpositive/spark/parallel.q.out index 4d05fac..46f0aa4 100644 --- a/ql/src/test/results/clientpositive/spark/parallel.q.out +++ b/ql/src/test/results/clientpositive/spark/parallel.q.out @@ -39,8 +39,8 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 3 <- Reducer 2 (GROUP PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 3 <- Reducer 2 (GROUP PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/parquet_join.q.out b/ql/src/test/results/clientpositive/spark/parquet_join.q.out index 390aeb1..72eb2de 100644 --- a/ql/src/test/results/clientpositive/spark/parquet_join.q.out +++ b/ql/src/test/results/clientpositive/spark/parquet_join.q.out @@ -76,7 +76,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/pcr.q.out b/ql/src/test/results/clientpositive/spark/pcr.q.out index 4c22f0b..dccb29d 100644 --- a/ql/src/test/results/clientpositive/spark/pcr.q.out +++ b/ql/src/test/results/clientpositive/spark/pcr.q.out @@ -2753,7 +2753,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) Reducer 3 <- Reducer 2 (SORT, 1) #### A masked pattern was here #### Vertices: @@ -3061,7 +3061,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) Reducer 3 <- Reducer 2 (SORT, 1) #### A masked pattern was here #### Vertices: diff --git a/ql/src/test/results/clientpositive/spark/ppd_gby_join.q.out b/ql/src/test/results/clientpositive/spark/ppd_gby_join.q.out index e76f9cf..446494c 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_gby_join.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_gby_join.q.out @@ -30,8 +30,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (GROUP, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -305,8 +305,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (GROUP, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/ppd_join.q.out b/ql/src/test/results/clientpositive/spark/ppd_join.q.out index 2925a83..02cbef9 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_join.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_join.q.out @@ -28,7 +28,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -568,7 +568,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/ppd_join2.q.out b/ql/src/test/results/clientpositive/spark/ppd_join2.q.out index dd4d129..db49f17 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_join2.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_join2.q.out @@ -34,8 +34,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Reducer 4 (PARTITION-LEVEL SORT, 2) + Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Reducer 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1740,8 +1740,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Reducer 4 (PARTITION-LEVEL SORT, 2) + Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Reducer 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/ppd_join3.q.out b/ql/src/test/results/clientpositive/spark/ppd_join3.q.out index c93994c..69295b4 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_join3.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_join3.q.out @@ -34,8 +34,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Reducer 4 (PARTITION-LEVEL SORT, 2) + Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Reducer 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1802,8 +1802,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Reducer 4 (PARTITION-LEVEL SORT, 2) + Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Reducer 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/ppd_join4.q.out b/ql/src/test/results/clientpositive/spark/ppd_join4.q.out index 193311a..66ead52 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_join4.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_join4.q.out @@ -52,8 +52,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Map 4 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Map 4 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/ppd_join5.q.out b/ql/src/test/results/clientpositive/spark/ppd_join5.q.out index 5943e7c..ab0b057 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_join5.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_join5.q.out @@ -51,7 +51,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 1), Reducer 2 (PARTITION-LEVEL SORT, 1) #### A masked pattern was here #### Vertices: @@ -159,7 +159,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 1), Reducer 2 (PARTITION-LEVEL SORT, 1) #### A masked pattern was here #### Vertices: diff --git a/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out b/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out index 0cbd718..45ec5c7 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out @@ -127,8 +127,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 3 <- Map 4 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 3 <- Map 4 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -501,8 +501,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 3 <- Map 4 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 3 <- Map 4 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -875,8 +875,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 3 <- Map 4 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 3 <- Map 4 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1249,8 +1249,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 3 <- Map 4 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 3 <- Map 4 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/ppd_multi_insert.q.out b/ql/src/test/results/clientpositive/spark/ppd_multi_insert.q.out index 5c8cc5d..0d9b28d 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_multi_insert.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_multi_insert.q.out @@ -62,7 +62,7 @@ STAGE PLANS: Stage: Stage-4 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1335,7 +1335,7 @@ STAGE PLANS: Stage: Stage-4 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/ppd_outer_join1.q.out b/ql/src/test/results/clientpositive/spark/ppd_outer_join1.q.out index 7c10afe..398722e 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_outer_join1.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_outer_join1.q.out @@ -28,7 +28,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -142,7 +142,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/ppd_outer_join2.q.out b/ql/src/test/results/clientpositive/spark/ppd_outer_join2.q.out index c70133e..9b807e8 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_outer_join2.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_outer_join2.q.out @@ -28,7 +28,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -262,7 +262,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/ppd_outer_join3.q.out b/ql/src/test/results/clientpositive/spark/ppd_outer_join3.q.out index 6a0654a..da8046e 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_outer_join3.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_outer_join3.q.out @@ -28,7 +28,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -256,7 +256,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/ppd_outer_join4.q.out b/ql/src/test/results/clientpositive/spark/ppd_outer_join4.q.out index 9bcacb3..a7638c8 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_outer_join4.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_outer_join4.q.out @@ -34,8 +34,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Reducer 4 (PARTITION-LEVEL SORT, 2) + Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Reducer 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -447,8 +447,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Reducer 4 (PARTITION-LEVEL SORT, 2) + Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Reducer 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/ppd_outer_join5.q.out b/ql/src/test/results/clientpositive/spark/ppd_outer_join5.q.out index 690a9e3..fb6253e 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_outer_join5.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_outer_join5.q.out @@ -42,7 +42,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -129,7 +129,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -216,7 +216,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/ppd_transform.q.out b/ql/src/test/results/clientpositive/spark/ppd_transform.q.out index 52a847a..523a992 100644 --- a/ql/src/test/results/clientpositive/spark/ppd_transform.q.out +++ b/ql/src/test/results/clientpositive/spark/ppd_transform.q.out @@ -28,7 +28,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -208,7 +208,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/ptf.q.out b/ql/src/test/results/clientpositive/spark/ptf.q.out index 1ca6951..8e473b5 100644 --- a/ql/src/test/results/clientpositive/spark/ptf.q.out +++ b/ql/src/test/results/clientpositive/spark/ptf.q.out @@ -32,8 +32,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -203,9 +203,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -388,7 +388,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -510,8 +510,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -687,8 +687,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -867,9 +867,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (GROUP, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (GROUP, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1062,8 +1062,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Map 4 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Map 4 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1211,8 +1211,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Reducer 4 (PARTITION-LEVEL SORT, 2) + Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Reducer 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1364,8 +1364,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1535,8 +1535,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1725,8 +1725,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1900,9 +1900,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -2141,8 +2141,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -2320,9 +2320,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -2541,8 +2541,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (GROUP, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -2694,8 +2694,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -2916,11 +2916,11 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 6 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 7 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 6 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 7 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Reducer 4 (PARTITION-LEVEL SORT, 2) + Reducer 6 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 7 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 6 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 7 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Reducer 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -3318,9 +3318,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -3588,10 +3588,10 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Reducer 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Reducer 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -3850,9 +3850,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -4092,10 +4092,10 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Reducer 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Reducer 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -4373,9 +4373,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -4628,9 +4628,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/ptf_matchpath.q.out b/ql/src/test/results/clientpositive/spark/ptf_matchpath.q.out index f9a9734..66e803e 100644 --- a/ql/src/test/results/clientpositive/spark/ptf_matchpath.q.out +++ b/ql/src/test/results/clientpositive/spark/ptf_matchpath.q.out @@ -70,7 +70,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -196,7 +196,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -312,7 +312,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/ptf_streaming.q.out b/ql/src/test/results/clientpositive/spark/ptf_streaming.q.out index ddf5555..ac19bba 100644 --- a/ql/src/test/results/clientpositive/spark/ptf_streaming.q.out +++ b/ql/src/test/results/clientpositive/spark/ptf_streaming.q.out @@ -32,8 +32,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -203,9 +203,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -390,8 +390,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Map 4 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Map 4 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -539,8 +539,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -710,8 +710,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -902,9 +902,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1137,9 +1137,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1372,9 +1372,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1611,9 +1611,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1854,9 +1854,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -2124,10 +2124,10 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Reducer 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Reducer 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -2384,9 +2384,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/reduce_deduplicate_exclude_join.q.out b/ql/src/test/results/clientpositive/spark/reduce_deduplicate_exclude_join.q.out index be70e98..24eac7d 100644 --- a/ql/src/test/results/clientpositive/spark/reduce_deduplicate_exclude_join.q.out +++ b/ql/src/test/results/clientpositive/spark/reduce_deduplicate_exclude_join.q.out @@ -30,7 +30,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out b/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out index 36af99a..e8da48d 100644 --- a/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out +++ b/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out @@ -112,7 +112,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -596,7 +596,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -977,7 +977,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1358,7 +1358,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/runtime_skewjoin_mapjoin_spark.q.out b/ql/src/test/results/clientpositive/spark/runtime_skewjoin_mapjoin_spark.q.out index 2348058..499b9ce 100644 --- a/ql/src/test/results/clientpositive/spark/runtime_skewjoin_mapjoin_spark.q.out +++ b/ql/src/test/results/clientpositive/spark/runtime_skewjoin_mapjoin_spark.q.out @@ -49,7 +49,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -158,7 +158,7 @@ STAGE PLANS: Stage: Stage-5 Spark Edges: - Reducer 3 <- Map 11 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 3 <- Map 11 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 11 diff --git a/ql/src/test/results/clientpositive/spark/sample10.q.out b/ql/src/test/results/clientpositive/spark/sample10.q.out index 2d6ca1b..84cb675 100644 --- a/ql/src/test/results/clientpositive/spark/sample10.q.out +++ b/ql/src/test/results/clientpositive/spark/sample10.q.out @@ -89,7 +89,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) Reducer 3 <- Reducer 2 (SORT, 1) #### A masked pattern was here #### Vertices: diff --git a/ql/src/test/results/clientpositive/spark/sample8.q.out b/ql/src/test/results/clientpositive/spark/sample8.q.out index 65fab26..8fd8509 100644 --- a/ql/src/test/results/clientpositive/spark/sample8.q.out +++ b/ql/src/test/results/clientpositive/spark/sample8.q.out @@ -92,7 +92,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -807,7 +807,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -898,7 +898,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/script_env_var1.q.out b/ql/src/test/results/clientpositive/spark/script_env_var1.q.out index 5ab1c20..cd39eb8 100644 --- a/ql/src/test/results/clientpositive/spark/script_env_var1.q.out +++ b/ql/src/test/results/clientpositive/spark/script_env_var1.q.out @@ -1,16 +1,16 @@ PREHOOK: query: -- Verifies that script operator ID environment variables have unique values -- in each instance of the script operator. SELECT count(1) FROM -( SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' AS key FROM src LIMIT 1)x UNION ALL - SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' AS key FROM src LIMIT 1)y ) a GROUP BY key +( SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' AS key FROM src order by key LIMIT 1)x UNION ALL + SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' AS key FROM src order by key LIMIT 1)y ) a GROUP BY key PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### POSTHOOK: query: -- Verifies that script operator ID environment variables have unique values -- in each instance of the script operator. SELECT count(1) FROM -( SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' AS key FROM src LIMIT 1)x UNION ALL - SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' AS key FROM src LIMIT 1)y ) a GROUP BY key +( SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' AS key FROM src order by key LIMIT 1)x UNION ALL + SELECT * FROM (SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'sh' AS key FROM src order by key LIMIT 1)y ) a GROUP BY key POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/semijoin.q.out b/ql/src/test/results/clientpositive/spark/semijoin.q.out index 96edf5f..a64de3a 100644 --- a/ql/src/test/results/clientpositive/spark/semijoin.q.out +++ b/ql/src/test/results/clientpositive/spark/semijoin.q.out @@ -130,8 +130,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -232,8 +232,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -336,8 +336,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -432,8 +432,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -539,8 +539,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -638,8 +638,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -741,8 +741,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -841,8 +841,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -971,7 +971,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1059,8 +1059,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1159,8 +1159,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1292,8 +1292,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1455,7 +1455,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1543,8 +1543,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1672,8 +1672,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1804,8 +1804,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1936,8 +1936,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -2068,8 +2068,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -2202,8 +2202,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -2347,9 +2347,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Map 6 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Map 6 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -2507,7 +2507,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/skewjoin.q.out b/ql/src/test/results/clientpositive/spark/skewjoin.q.out index 35d4f6f..1455a41 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoin.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoin.q.out @@ -70,11 +70,13 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T4 POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@t4 -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value POSTHOOK: type: QUERY @@ -90,7 +92,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -201,12 +203,14 @@ STAGE PLANS: Stage: Stage-2 Stats-Aggr Operator -PREHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key) +PREHOOK: query: -- SORT_QUERY_RESULTS +FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@dest_j1 -POSTHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key) +POSTHOOK: query: -- SORT_QUERY_RESULTS +FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src @@ -222,13 +226,15 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@dest_j1 #### A masked pattern was here #### 278697 101852390308 -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN SELECT /*+ STREAMTABLE(a) */ * FROM T1 a JOIN T2 b ON a.key = b.key JOIN T3 c ON b.key = c.key JOIN T4 d ON c.key = d.key PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN SELECT /*+ STREAMTABLE(a) */ * FROM T1 a JOIN T2 b ON a.key = b.key JOIN T3 c ON b.key = c.key @@ -242,7 +248,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -333,7 +339,8 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT /*+ STREAMTABLE(a) */ * +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ STREAMTABLE(a) */ * FROM T1 a JOIN T2 b ON a.key = b.key JOIN T3 c ON b.key = c.key JOIN T4 d ON c.key = d.key @@ -343,7 +350,8 @@ PREHOOK: Input: default@t2 PREHOOK: Input: default@t3 PREHOOK: Input: default@t4 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ STREAMTABLE(a) */ * +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ STREAMTABLE(a) */ * FROM T1 a JOIN T2 b ON a.key = b.key JOIN T3 c ON b.key = c.key JOIN T4 d ON c.key = d.key @@ -354,13 +362,15 @@ POSTHOOK: Input: default@t3 POSTHOOK: Input: default@t4 #### A masked pattern was here #### 2 12 2 22 2 12 2 12 -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN SELECT /*+ STREAMTABLE(a,c) */ * FROM T1 a JOIN T2 b ON a.key = b.key JOIN T3 c ON b.key = c.key JOIN T4 d ON c.key = d.key PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN SELECT /*+ STREAMTABLE(a,c) */ * FROM T1 a JOIN T2 b ON a.key = b.key JOIN T3 c ON b.key = c.key @@ -374,7 +384,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -465,7 +475,8 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT /*+ STREAMTABLE(a,c) */ * +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ STREAMTABLE(a,c) */ * FROM T1 a JOIN T2 b ON a.key = b.key JOIN T3 c ON b.key = c.key JOIN T4 d ON c.key = d.key @@ -475,7 +486,8 @@ PREHOOK: Input: default@t2 PREHOOK: Input: default@t3 PREHOOK: Input: default@t4 #### A masked pattern was here #### -POSTHOOK: query: SELECT /*+ STREAMTABLE(a,c) */ * +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT /*+ STREAMTABLE(a,c) */ * FROM T1 a JOIN T2 b ON a.key = b.key JOIN T3 c ON b.key = c.key JOIN T4 d ON c.key = d.key @@ -486,9 +498,11 @@ POSTHOOK: Input: default@t3 POSTHOOK: Input: default@t4 #### A masked pattern was here #### 2 12 2 22 2 12 2 12 -PREHOOK: query: EXPLAIN FROM T1 a JOIN src c ON c.key+1=a.key SELECT /*+ STREAMTABLE(a) */ sum(hash(a.key)), sum(hash(a.val)), sum(hash(c.key)) +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN FROM T1 a JOIN src c ON c.key+1=a.key SELECT /*+ STREAMTABLE(a) */ sum(hash(a.key)), sum(hash(a.val)), sum(hash(c.key)) PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN FROM T1 a JOIN src c ON c.key+1=a.key SELECT /*+ STREAMTABLE(a) */ sum(hash(a.key)), sum(hash(a.val)), sum(hash(c.key)) +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN FROM T1 a JOIN src c ON c.key+1=a.key SELECT /*+ STREAMTABLE(a) */ sum(hash(a.key)), sum(hash(a.val)), sum(hash(c.key)) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -498,7 +512,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) Reducer 3 <- Reducer 2 (GROUP, 1) #### A masked pattern was here #### Vertices: @@ -570,25 +584,29 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: FROM T1 a JOIN src c ON c.key+1=a.key SELECT /*+ STREAMTABLE(a) */ sum(hash(a.key)), sum(hash(a.val)), sum(hash(c.key)) +PREHOOK: query: -- SORT_QUERY_RESULTS +FROM T1 a JOIN src c ON c.key+1=a.key SELECT /*+ STREAMTABLE(a) */ sum(hash(a.key)), sum(hash(a.val)), sum(hash(c.key)) PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@t1 #### A masked pattern was here #### -POSTHOOK: query: FROM T1 a JOIN src c ON c.key+1=a.key SELECT /*+ STREAMTABLE(a) */ sum(hash(a.key)), sum(hash(a.val)), sum(hash(c.key)) +POSTHOOK: query: -- SORT_QUERY_RESULTS +FROM T1 a JOIN src c ON c.key+1=a.key SELECT /*+ STREAMTABLE(a) */ sum(hash(a.key)), sum(hash(a.val)), sum(hash(c.key)) POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@t1 #### A masked pattern was here #### 198 6274 194 -PREHOOK: query: EXPLAIN FROM +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN FROM (SELECT src.* FROM src) x JOIN (SELECT src.* FROM src) Y ON (x.key = Y.key) SELECT sum(hash(Y.key)), sum(hash(Y.value)) PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN FROM +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN FROM (SELECT src.* FROM src) x JOIN (SELECT src.* FROM src) Y @@ -607,7 +625,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -746,7 +764,8 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: FROM +PREHOOK: query: -- SORT_QUERY_RESULTS +FROM (SELECT src.* FROM src) x JOIN (SELECT src.* FROM src) Y @@ -755,7 +774,8 @@ SELECT sum(hash(Y.key)), sum(hash(Y.value)) PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: FROM +POSTHOOK: query: -- SORT_QUERY_RESULTS +FROM (SELECT src.* FROM src) x JOIN (SELECT src.* FROM src) Y @@ -765,14 +785,16 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### 44481300 101852390308 -PREHOOK: query: EXPLAIN FROM +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN FROM (SELECT src.* FROM src) x JOIN (SELECT src.* FROM src) Y ON (x.key = Y.key and substring(x.value, 5)=substring(y.value, 5)+1) SELECT sum(hash(Y.key)), sum(hash(Y.value)) PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN FROM +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN FROM (SELECT src.* FROM src) x JOIN (SELECT src.* FROM src) Y @@ -791,7 +813,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -930,7 +952,8 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: FROM +PREHOOK: query: -- SORT_QUERY_RESULTS +FROM (SELECT src.* FROM src) x JOIN (SELECT src.* FROM src) Y @@ -939,7 +962,8 @@ SELECT sum(hash(Y.key)), sum(hash(Y.value)) PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: FROM +POSTHOOK: query: -- SORT_QUERY_RESULTS +FROM (SELECT src.* FROM src) x JOIN (SELECT src.* FROM src) Y @@ -987,7 +1011,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 4 @@ -1093,7 +1117,7 @@ STAGE PLANS: Stage: Stage-5 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 10 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 10 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/skewjoin_noskew.q.out b/ql/src/test/results/clientpositive/spark/skewjoin_noskew.q.out index 8afc656..5b8b713 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoin_noskew.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoin_noskew.q.out @@ -18,7 +18,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_1.q.out b/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_1.q.out index 0ce2bb9..8d98499 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_1.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_1.q.out @@ -68,8 +68,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -201,8 +201,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -342,8 +342,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -493,8 +493,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_2.q.out b/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_2.q.out index 3d629be..2d57ae5 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_2.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_2.q.out @@ -80,8 +80,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 2), Map 7 (PARTITION-LEVEL SORT, 2), Map 8 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 4), Map 7 (PARTITION-LEVEL SORT, 4), Map 8 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt1.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt1.q.out index 93e08eb..ce7ebcf 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt1.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt1.q.out @@ -54,8 +54,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -187,8 +187,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -322,8 +322,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 2), Map 7 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 4), Map 7 (PARTITION-LEVEL SORT, 4) Reducer 3 <- Reducer 2 (GROUP, 1), Reducer 6 (GROUP, 1) #### A masked pattern was here #### Vertices: @@ -449,8 +449,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 2), Map 7 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 4), Map 7 (PARTITION-LEVEL SORT, 4) Reducer 3 <- Reducer 2 (GROUP, 1), Reducer 6 (GROUP, 1) #### A masked pattern was here #### Vertices: diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt10.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt10.q.out index a30ccc9..5d4177b 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt10.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt10.q.out @@ -56,8 +56,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt11.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt11.q.out index 2dfe692..66c28be 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt11.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt11.q.out @@ -66,10 +66,10 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 11 <- Map 10 (PARTITION-LEVEL SORT, 2), Map 12 (PARTITION-LEVEL SORT, 2) - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) - Reducer 8 <- Map 7 (PARTITION-LEVEL SORT, 2), Map 9 (PARTITION-LEVEL SORT, 2) + Reducer 11 <- Map 10 (PARTITION-LEVEL SORT, 4), Map 12 (PARTITION-LEVEL SORT, 4) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) + Reducer 8 <- Map 7 (PARTITION-LEVEL SORT, 4), Map 9 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt12.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt12.q.out index 667ec5c..0102f23 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt12.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt12.q.out @@ -56,8 +56,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt13.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt13.q.out index 88d84c4..b2d82a2 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt13.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt13.q.out @@ -82,8 +82,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt14.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt14.q.out index 5bc8a76..6917b8e 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt14.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt14.q.out @@ -86,9 +86,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 7 <- Map 6 (PARTITION-LEVEL SORT, 2), Map 8 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2), Reducer 7 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 7 <- Map 6 (PARTITION-LEVEL SORT, 4), Map 8 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4), Reducer 7 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt15.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt15.q.out index 3ac7511..698f067 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt15.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt15.q.out @@ -94,8 +94,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -227,8 +227,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -362,8 +362,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 2), Map 7 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 4), Map 7 (PARTITION-LEVEL SORT, 4) Reducer 3 <- Reducer 2 (GROUP, 1), Reducer 6 (GROUP, 1) #### A masked pattern was here #### Vertices: @@ -489,8 +489,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 2), Map 7 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 4), Map 7 (PARTITION-LEVEL SORT, 4) Reducer 3 <- Reducer 2 (GROUP, 1), Reducer 6 (GROUP, 1) #### A masked pattern was here #### Vertices: diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt16.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt16.q.out index 46a28de..71bfa49 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt16.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt16.q.out @@ -56,8 +56,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt17.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt17.q.out index 8c7d620..c35b85c 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt17.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt17.q.out @@ -60,8 +60,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -249,8 +249,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt18.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt18.q.out index 60c4677..4394d39 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt18.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt18.q.out @@ -82,7 +82,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt19.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt19.q.out index eb9bb84..12a1fea 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt19.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt19.q.out @@ -58,8 +58,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt2.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt2.q.out index 1c5f36d..d8e8dc7 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt2.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt2.q.out @@ -64,8 +64,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -190,8 +190,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -320,9 +320,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 2), Map 7 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (GROUP, 2), Reducer 6 (GROUP, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 4), Map 7 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (GROUP, 4), Reducer 6 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -457,9 +457,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 2), Map 7 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (GROUP, 2), Reducer 6 (GROUP, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 4), Map 7 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (GROUP, 4), Reducer 6 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt20.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt20.q.out index 22de156..5583ef5 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt20.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt20.q.out @@ -58,8 +58,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt3.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt3.q.out index 0707b4c..43acfc0 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt3.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt3.q.out @@ -58,8 +58,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -191,8 +191,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt4.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt4.q.out index cff75a6..7d99f0f 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt4.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt4.q.out @@ -54,8 +54,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -185,8 +185,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt5.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt5.q.out index 3c4cb67..b621371 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt5.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt5.q.out @@ -56,8 +56,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt6.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt6.q.out index 16a218b..7b7d057 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt6.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt6.q.out @@ -58,8 +58,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt7.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt7.q.out index bba46c0..462ebf5 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt7.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt7.q.out @@ -74,8 +74,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 2), Map 7 (PARTITION-LEVEL SORT, 2), Map 8 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 4), Map 7 (PARTITION-LEVEL SORT, 4), Map 8 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt8.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt8.q.out index 7c8328f..cbad442 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt8.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt8.q.out @@ -72,8 +72,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 2), Map 7 (PARTITION-LEVEL SORT, 2), Map 8 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 4), Map 7 (PARTITION-LEVEL SORT, 4), Map 8 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/skewjoinopt9.q.out b/ql/src/test/results/clientpositive/spark/skewjoinopt9.q.out index 4c789cf..240d6a8 100644 --- a/ql/src/test/results/clientpositive/spark/skewjoinopt9.q.out +++ b/ql/src/test/results/clientpositive/spark/skewjoinopt9.q.out @@ -64,7 +64,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -199,8 +199,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 3 <- Map 4 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 3 <- Map 4 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_25.q.out b/ql/src/test/results/clientpositive/spark/smb_mapjoin_25.q.out index cb811ed..c955c7b 100644 --- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_25.q.out +++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_25.q.out @@ -60,9 +60,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 2), Map 7 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2), Reducer 6 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 4), Map 7 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4), Reducer 6 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/sort.q.out b/ql/src/test/results/clientpositive/spark/sort.q.out index 9708f7e..909d991 100644 --- a/ql/src/test/results/clientpositive/spark/sort.q.out +++ b/ql/src/test/results/clientpositive/spark/sort.q.out @@ -16,7 +16,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/subquery_exists.q.out b/ql/src/test/results/clientpositive/spark/subquery_exists.q.out index 0b88715..4201459 100644 --- a/ql/src/test/results/clientpositive/spark/subquery_exists.q.out +++ b/ql/src/test/results/clientpositive/spark/subquery_exists.q.out @@ -1,6 +1,7 @@ PREHOOK: query: -- SORT_QUERY_RESULTS -- no agg, corr +-- SORT_QUERY_RESULTS explain select * from src b @@ -13,6 +14,7 @@ PREHOOK: type: QUERY POSTHOOK: query: -- SORT_QUERY_RESULTS -- no agg, corr +-- SORT_QUERY_RESULTS explain select * from src b @@ -30,7 +32,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -92,7 +94,8 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select * +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from src b where exists (select a.key @@ -102,7 +105,8 @@ where exists PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: select * +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from src b where exists (select a.key @@ -124,6 +128,7 @@ POSTHOOK: Input: default@src 98 val_98 98 val_98 PREHOOK: query: -- view test +-- SORT_QUERY_RESULTS create view cv1 as select * from src b @@ -136,6 +141,7 @@ PREHOOK: Input: default@src PREHOOK: Output: database:default PREHOOK: Output: default@cv1 POSTHOOK: query: -- view test +-- SORT_QUERY_RESULTS create view cv1 as select * from src b @@ -147,12 +153,14 @@ POSTHOOK: type: CREATEVIEW POSTHOOK: Input: default@src POSTHOOK: Output: database:default POSTHOOK: Output: default@cv1 -PREHOOK: query: select * from cv1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from cv1 PREHOOK: type: QUERY PREHOOK: Input: default@cv1 PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: select * from cv1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from cv1 POSTHOOK: type: QUERY POSTHOOK: Input: default@cv1 POSTHOOK: Input: default@src @@ -169,6 +177,7 @@ POSTHOOK: Input: default@src 98 val_98 98 val_98 PREHOOK: query: -- sq in from +-- SORT_QUERY_RESULTS select * from (select * from src b @@ -181,6 +190,7 @@ PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### POSTHOOK: query: -- sq in from +-- SORT_QUERY_RESULTS select * from (select * from src b diff --git a/ql/src/test/results/clientpositive/spark/subquery_in.q.out b/ql/src/test/results/clientpositive/spark/subquery_in.q.out index 6cf1ae4..2642f5f 100644 --- a/ql/src/test/results/clientpositive/spark/subquery_in.q.out +++ b/ql/src/test/results/clientpositive/spark/subquery_in.q.out @@ -22,7 +22,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -136,7 +136,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -257,9 +257,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 4) Reducer 5 <- Reducer 4 (GROUP, 1) - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Reducer 5 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Reducer 5 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -425,9 +425,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Reducer 4 (GROUP, 2) - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Reducer 5 (PARTITION-LEVEL SORT, 2) + Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Reducer 4 (GROUP, 4) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Reducer 5 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -605,8 +605,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 4 <- Map 3 (GROUP, 2) - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Reducer 4 (PARTITION-LEVEL SORT, 2) + Reducer 4 <- Map 3 (GROUP, 4) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Reducer 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -756,9 +756,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Map 6 (PARTITION-LEVEL SORT, 2), Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Map 6 (PARTITION-LEVEL SORT, 4), Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/subquery_multiinsert.q.java1.7.out b/ql/src/test/results/clientpositive/spark/subquery_multiinsert.q.java1.7.out index 92a8595..9d1f3c5 100644 --- a/ql/src/test/results/clientpositive/spark/subquery_multiinsert.q.java1.7.out +++ b/ql/src/test/results/clientpositive/spark/subquery_multiinsert.q.java1.7.out @@ -75,8 +75,8 @@ STAGE PLANS: Spark Edges: Reducer 2 <- Map 10 (PARTITION-LEVEL SORT, 1), Reducer 9 (PARTITION-LEVEL SORT, 1) - Reducer 3 <- Map 7 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Map 11 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) + Reducer 3 <- Map 7 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Map 11 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) Reducer 9 <- Map 8 (GROUP, 1) Reducer 4 <- Reducer 3 (SORT, 1) #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/temp_table.q.out b/ql/src/test/results/clientpositive/spark/temp_table.q.out index 16d663d..4e1708f 100644 --- a/ql/src/test/results/clientpositive/spark/temp_table.q.out +++ b/ql/src/test/results/clientpositive/spark/temp_table.q.out @@ -146,48 +146,76 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@bar key string value string -PREHOOK: query: explain select * from foo limit 10 +PREHOOK: query: explain select * from foo order by key limit 10 PREHOOK: type: QUERY -POSTHOOK: query: explain select * from foo limit 10 +POSTHOOK: query: explain select * from foo order by key limit 10 POSTHOOK: type: QUERY STAGE DEPENDENCIES: - Stage-0 is a root stage + Stage-1 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: + Stage: Stage-1 + Spark + Edges: + Reducer 2 <- Map 1 (SORT, 1) +#### A masked pattern was here #### + Vertices: + Map 1 + Map Operator Tree: + TableScan + alias: foo + Statistics: Num rows: 247 Data size: 2609 Basic stats: COMPLETE Column stats: NONE + Select Operator + expressions: key (type: string), value (type: string) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 247 Data size: 2609 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col0 (type: string) + sort order: + + Statistics: Num rows: 247 Data size: 2609 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: string) + Reducer 2 + Reduce Operator Tree: + Select Operator + expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 247 Data size: 2609 Basic stats: COMPLETE Column stats: NONE + Limit + Number of rows: 10 + Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE Column stats: NONE + File Output Operator + compressed: false + Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE Column stats: NONE + table: + input format: org.apache.hadoop.mapred.TextInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + Stage: Stage-0 Fetch Operator limit: 10 Processor Tree: - TableScan - alias: foo - Statistics: Num rows: 247 Data size: 2609 Basic stats: COMPLETE Column stats: NONE - Select Operator - expressions: key (type: string), value (type: string) - outputColumnNames: _col0, _col1 - Statistics: Num rows: 247 Data size: 2609 Basic stats: COMPLETE Column stats: NONE - Limit - Number of rows: 10 - Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE Column stats: NONE - ListSink + ListSink -PREHOOK: query: select * from foo limit 10 +PREHOOK: query: select * from foo order by key limit 10 PREHOOK: type: QUERY PREHOOK: Input: default@foo #### A masked pattern was here #### -POSTHOOK: query: select * from foo limit 10 +POSTHOOK: query: select * from foo order by key limit 10 POSTHOOK: type: QUERY POSTHOOK: Input: default@foo #### A masked pattern was here #### -238 val_238 -86 val_86 -278 val_278 -98 val_98 -484 val_484 -150 val_150 -224 val_224 -66 val_66 -128 val_128 -146 val_146 +0 val_0 +0 val_0 +0 val_0 +10 val_10 +100 val_100 +100 val_100 +104 val_104 +104 val_104 +114 val_114 +116 val_116 PREHOOK: query: explain select * from (select * from foo union all select * from bar) u order by key limit 10 PREHOOK: type: QUERY POSTHOOK: query: explain select * from (select * from foo union all select * from bar) u order by key limit 10 @@ -312,11 +340,11 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@bay POSTHOOK: Lineage: bay.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: bay.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: select * from bay limit 10 +PREHOOK: query: select * from bay order by key limit 10 PREHOOK: type: QUERY PREHOOK: Input: default@bay #### A masked pattern was here #### -POSTHOOK: query: select * from bay limit 10 +POSTHOOK: query: select * from bay order by key limit 10 POSTHOOK: type: QUERY POSTHOOK: Input: default@bay #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/temp_table_join1.q.out b/ql/src/test/results/clientpositive/spark/temp_table_join1.q.out index 1a1340e..efe5bc4 100644 --- a/ql/src/test/results/clientpositive/spark/temp_table_join1.q.out +++ b/ql/src/test/results/clientpositive/spark/temp_table_join1.q.out @@ -40,7 +40,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -136,7 +136,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -234,7 +234,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/tez_join_tests.q.out b/ql/src/test/results/clientpositive/spark/tez_join_tests.q.out index 9d6c1db..6f35d39 100644 --- a/ql/src/test/results/clientpositive/spark/tez_join_tests.q.out +++ b/ql/src/test/results/clientpositive/spark/tez_join_tests.q.out @@ -16,8 +16,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Map 7 (PARTITION-LEVEL SORT, 2), Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Map 7 (PARTITION-LEVEL SORT, 4), Reducer 3 (PARTITION-LEVEL SORT, 4) Reducer 3 <- Reducer 2 (SORT, 1) Reducer 5 <- Reducer 4 (SORT, 1) #### A masked pattern was here #### @@ -1973,12 +1973,14 @@ POSTHOOK: Input: default@src1 98 val_98 98 val_98 98 val_98 98 val_98 98 val_98 98 val_98 98 val_98 98 val_98 98 val_98 -PREHOOK: query: select * from src1 a left outer join src b on (a.key = b.key) join src c on (a.key = c.key) +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from src1 a left outer join src b on (a.key = b.key) join src c on (a.key = c.key) PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@src1 #### A masked pattern was here #### -POSTHOOK: query: select * from src1 a left outer join src b on (a.key = b.key) join src c on (a.key = c.key) +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from src1 a left outer join src b on (a.key = b.key) join src c on (a.key = c.key) POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@src1 @@ -2090,12 +2092,14 @@ POSTHOOK: Input: default@src1 98 val_98 98 val_98 98 val_98 98 val_98 98 val_98 98 val_98 98 val_98 98 val_98 98 val_98 -PREHOOK: query: select * from src1 a join src b on (a.key = b.key) join src c on (a.key = c.key) +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from src1 a join src b on (a.key = b.key) join src c on (a.key = c.key) PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@src1 #### A masked pattern was here #### -POSTHOOK: query: select * from src1 a join src b on (a.key = b.key) join src c on (a.key = c.key) +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from src1 a join src b on (a.key = b.key) join src c on (a.key = c.key) POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@src1 diff --git a/ql/src/test/results/clientpositive/spark/tez_joins_explain.q.out b/ql/src/test/results/clientpositive/spark/tez_joins_explain.q.out index ad3048b..2ed6985 100644 --- a/ql/src/test/results/clientpositive/spark/tez_joins_explain.q.out +++ b/ql/src/test/results/clientpositive/spark/tez_joins_explain.q.out @@ -1,10 +1,8 @@ PREHOOK: query: -- SORT_QUERY_RESULTS - explain select * from (select b.key, b.value from src1 a left outer join src b on (a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) order by x.key PREHOOK: type: QUERY POSTHOOK: query: -- SORT_QUERY_RESULTS - explain select * from (select b.key, b.value from src1 a left outer join src b on (a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) order by x.key POSTHOOK: type: QUERY @@ -16,8 +14,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Map 7 (PARTITION-LEVEL SORT, 2), Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Map 7 (PARTITION-LEVEL SORT, 4), Reducer 3 (PARTITION-LEVEL SORT, 4) Reducer 3 <- Reducer 2 (SORT, 1) Reducer 5 <- Reducer 4 (SORT, 1) #### A masked pattern was here #### @@ -128,12 +126,14 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select * from (select b.key, b.value from src1 a left outer join src b on (a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) order by x.key +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from (select b.key, b.value from src1 a left outer join src b on (a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) order by x.key PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@src1 #### A masked pattern was here #### -POSTHOOK: query: select * from (select b.key, b.value from src1 a left outer join src b on (a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) order by x.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from (select b.key, b.value from src1 a left outer join src b on (a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) order by x.key POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@src1 diff --git a/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out b/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out index 994d14e..ccc0476 100644 --- a/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out +++ b/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out @@ -103,7 +103,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out b/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out index de5162d..44d1e2b 100644 --- a/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out +++ b/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out @@ -105,7 +105,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/union11.q.out b/ql/src/test/results/clientpositive/spark/union11.q.out index 2689bb6..7362c5c 100644 --- a/ql/src/test/results/clientpositive/spark/union11.q.out +++ b/ql/src/test/results/clientpositive/spark/union11.q.out @@ -29,7 +29,7 @@ STAGE PLANS: Reducer 2 <- Map 1 (GROUP, 1) Reducer 5 <- Map 4 (GROUP, 1) Reducer 7 <- Map 6 (GROUP, 1) - Reducer 3 <- Reducer 2 (GROUP, 2), Reducer 5 (GROUP, 2), Reducer 7 (GROUP, 2) + Reducer 3 <- Reducer 2 (GROUP, 4), Reducer 5 (GROUP, 4), Reducer 7 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -184,6 +184,6 @@ POSTHOOK: query: select unionsrc.key, count(1) FROM (select 'tst1' as key, count POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### -tst2 1 tst1 1 tst3 1 +tst2 1 diff --git a/ql/src/test/results/clientpositive/spark/union14.q.out b/ql/src/test/results/clientpositive/spark/union14.q.out index 4027393..5c1753b 100644 --- a/ql/src/test/results/clientpositive/spark/union14.q.out +++ b/ql/src/test/results/clientpositive/spark/union14.q.out @@ -25,7 +25,7 @@ STAGE PLANS: Spark Edges: Reducer 4 <- Map 3 (GROUP, 1) - Reducer 2 <- Map 1 (GROUP, 2), Reducer 4 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4), Reducer 4 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -124,20 +124,20 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@src1 #### A masked pattern was here #### +213 1 +150 1 +66 1 + 10 +tst1 1 +224 1 238 1 311 1 146 1 278 1 -401 1 128 1 98 1 255 1 -213 1 -150 1 369 1 -66 1 - 10 406 1 -tst1 1 273 1 -224 1 +401 1 diff --git a/ql/src/test/results/clientpositive/spark/union15.q.out b/ql/src/test/results/clientpositive/spark/union15.q.out index fcc1cf7..9b9b486 100644 --- a/ql/src/test/results/clientpositive/spark/union15.q.out +++ b/ql/src/test/results/clientpositive/spark/union15.q.out @@ -27,7 +27,7 @@ STAGE PLANS: Spark Edges: Reducer 2 <- Map 1 (GROUP, 1) - Reducer 3 <- Map 4 (GROUP, 2), Map 5 (GROUP, 2), Reducer 2 (GROUP, 2) + Reducer 3 <- Map 4 (GROUP, 4), Map 5 (GROUP, 4), Reducer 2 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -148,20 +148,20 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@src1 #### A masked pattern was here #### +213 2 +150 2 +66 2 + 20 +tst1 1 +224 2 238 2 311 2 146 2 278 2 -401 2 128 2 98 2 255 2 -213 2 -150 2 369 2 -66 2 - 20 406 2 -tst1 1 273 2 -224 2 +401 2 diff --git a/ql/src/test/results/clientpositive/spark/union17.q.out b/ql/src/test/results/clientpositive/spark/union17.q.out index 4b0b682..f03f6c6 100644 --- a/ql/src/test/results/clientpositive/spark/union17.q.out +++ b/ql/src/test/results/clientpositive/spark/union17.q.out @@ -47,8 +47,8 @@ STAGE PLANS: Edges: Reducer 8 <- Map 1 (GROUP, 1) Reducer 9 <- Map 1 (GROUP, 1) - Reducer 3 <- Map 6 (GROUP PARTITION-LEVEL SORT, 2), Reducer 8 (GROUP PARTITION-LEVEL SORT, 2) - Reducer 4 <- Map 7 (GROUP PARTITION-LEVEL SORT, 2), Reducer 9 (GROUP PARTITION-LEVEL SORT, 2) + Reducer 3 <- Map 6 (GROUP PARTITION-LEVEL SORT, 4), Reducer 8 (GROUP PARTITION-LEVEL SORT, 4) + Reducer 4 <- Map 7 (GROUP PARTITION-LEVEL SORT, 4), Reducer 9 (GROUP PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/union19.q.out b/ql/src/test/results/clientpositive/spark/union19.q.out index b6b172f..552ddc9 100644 --- a/ql/src/test/results/clientpositive/spark/union19.q.out +++ b/ql/src/test/results/clientpositive/spark/union19.q.out @@ -48,7 +48,7 @@ STAGE PLANS: Spark Edges: Reducer 2 <- Map 1 (GROUP, 1) - Reducer 3 <- Map 4 (GROUP, 2), Reducer 2 (GROUP, 2) + Reducer 3 <- Map 4 (GROUP, 4), Reducer 2 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/union20.q.out b/ql/src/test/results/clientpositive/spark/union20.q.out index d1e23f6..2a39fcc 100644 --- a/ql/src/test/results/clientpositive/spark/union20.q.out +++ b/ql/src/test/results/clientpositive/spark/union20.q.out @@ -35,7 +35,7 @@ STAGE PLANS: Spark Edges: Reducer 2 <- Map 1 (GROUP, 1) - Reducer 3 <- Map 4 (PARTITION-LEVEL SORT, 2), Map 7 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2), Reducer 6 (PARTITION-LEVEL SORT, 2) + Reducer 3 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 7 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4), Reducer 6 (PARTITION-LEVEL SORT, 4) Reducer 6 <- Map 5 (GROUP, 1) #### A masked pattern was here #### Vertices: diff --git a/ql/src/test/results/clientpositive/spark/union21.q.out b/ql/src/test/results/clientpositive/spark/union21.q.out index 8a26f5e..8bf4cf5 100644 --- a/ql/src/test/results/clientpositive/spark/union21.q.out +++ b/ql/src/test/results/clientpositive/spark/union21.q.out @@ -42,7 +42,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2), Map 3 (GROUP, 2), Map 4 (GROUP, 2), Map 5 (GROUP, 2), Map 6 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4), Map 3 (GROUP, 4), Map 4 (GROUP, 4), Map 5 (GROUP, 4), Map 6 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/union24.q.out b/ql/src/test/results/clientpositive/spark/union24.q.out index 22ec159..d053182 100644 --- a/ql/src/test/results/clientpositive/spark/union24.q.out +++ b/ql/src/test/results/clientpositive/spark/union24.q.out @@ -187,7 +187,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 5 <- Map 4 (GROUP, 2) + Reducer 5 <- Map 4 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -237,7 +237,7 @@ STAGE PLANS: columns.types string:bigint #### A masked pattern was here #### name default.src2 - numFiles 2 + numFiles 4 numRows 309 rawDataSize 1482 serialization.ddl struct src2 { string key, i64 count} @@ -257,7 +257,7 @@ STAGE PLANS: columns.types string:bigint #### A masked pattern was here #### name default.src2 - numFiles 2 + numFiles 4 numRows 309 rawDataSize 1482 serialization.ddl struct src2 { string key, i64 count} @@ -729,7 +729,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) + Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -779,7 +779,7 @@ STAGE PLANS: columns.types string:bigint #### A masked pattern was here #### name default.src2 - numFiles 2 + numFiles 4 numRows 309 rawDataSize 1482 serialization.ddl struct src2 { string key, i64 count} @@ -799,7 +799,7 @@ STAGE PLANS: columns.types string:bigint #### A masked pattern was here #### name default.src2 - numFiles 2 + numFiles 4 numRows 309 rawDataSize 1482 serialization.ddl struct src2 { string key, i64 count} @@ -1247,8 +1247,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 2), Map 6 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Reducer 4 (GROUP, 2) + Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Reducer 4 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1298,7 +1298,7 @@ STAGE PLANS: columns.types string:bigint #### A masked pattern was here #### name default.src2 - numFiles 2 + numFiles 4 numRows 309 rawDataSize 1482 serialization.ddl struct src2 { string key, i64 count} @@ -1318,7 +1318,7 @@ STAGE PLANS: columns.types string:bigint #### A masked pattern was here #### name default.src2 - numFiles 2 + numFiles 4 numRows 309 rawDataSize 1482 serialization.ddl struct src2 { string key, i64 count} diff --git a/ql/src/test/results/clientpositive/spark/union25.q.out b/ql/src/test/results/clientpositive/spark/union25.q.out index 67416a3..dd70a6a 100644 --- a/ql/src/test/results/clientpositive/spark/union25.q.out +++ b/ql/src/test/results/clientpositive/spark/union25.q.out @@ -66,8 +66,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 4 <- Map 3 (GROUP, 2), Map 5 (GROUP, 2) - Reducer 2 <- Map 1 (GROUP, 2), Reducer 4 (GROUP, 2) + Reducer 4 <- Map 3 (GROUP, 4), Map 5 (GROUP, 4) + Reducer 2 <- Map 1 (GROUP, 4), Reducer 4 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/union26.q.out b/ql/src/test/results/clientpositive/spark/union26.q.out index fa996ed..576ed48 100644 --- a/ql/src/test/results/clientpositive/spark/union26.q.out +++ b/ql/src/test/results/clientpositive/spark/union26.q.out @@ -54,8 +54,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Map 5 (GROUP, 2), Reducer 2 (GROUP, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Map 5 (GROUP, 4), Reducer 2 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/union27.q.out b/ql/src/test/results/clientpositive/spark/union27.q.out index e66db27..62680f9 100644 --- a/ql/src/test/results/clientpositive/spark/union27.q.out +++ b/ql/src/test/results/clientpositive/spark/union27.q.out @@ -42,7 +42,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/union28.q.out b/ql/src/test/results/clientpositive/spark/union28.q.out index 0294bad..11d70a4 100644 --- a/ql/src/test/results/clientpositive/spark/union28.q.out +++ b/ql/src/test/results/clientpositive/spark/union28.q.out @@ -41,8 +41,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 3 <- Map 2 (GROUP, 2) - Reducer 5 <- Map 4 (GROUP, 2) + Reducer 3 <- Map 2 (GROUP, 4) + Reducer 5 <- Map 4 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/union3.q.out b/ql/src/test/results/clientpositive/spark/union3.q.out index 25e78e3..f82c3b1 100644 --- a/ql/src/test/results/clientpositive/spark/union3.q.out +++ b/ql/src/test/results/clientpositive/spark/union3.q.out @@ -48,7 +48,7 @@ STAGE PLANS: Reducer 5 <- Map 4 (GROUP, 1) Reducer 7 <- Map 6 (GROUP, 1) Reducer 9 <- Map 8 (GROUP, 1) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2), Reducer 5 (PARTITION-LEVEL SORT, 2), Reducer 7 (PARTITION-LEVEL SORT, 2), Reducer 9 (PARTITION-LEVEL SORT, 2) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4), Reducer 5 (PARTITION-LEVEL SORT, 4), Reducer 7 (PARTITION-LEVEL SORT, 4), Reducer 9 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/union30.q.out b/ql/src/test/results/clientpositive/spark/union30.q.out index b9b59d4..a99aa36 100644 --- a/ql/src/test/results/clientpositive/spark/union30.q.out +++ b/ql/src/test/results/clientpositive/spark/union30.q.out @@ -55,8 +55,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 3 <- Map 2 (GROUP, 2) - Reducer 5 <- Map 4 (GROUP, 2) + Reducer 3 <- Map 2 (GROUP, 4) + Reducer 5 <- Map 4 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/union31.q.out b/ql/src/test/results/clientpositive/spark/union31.q.out index d58d17c..99d247c 100644 --- a/ql/src/test/results/clientpositive/spark/union31.q.out +++ b/ql/src/test/results/clientpositive/spark/union31.q.out @@ -79,8 +79,8 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 2 <- Map 5 (GROUP, 2), Map 7 (GROUP, 2) - Reducer 3 <- Map 6 (GROUP, 2), Map 8 (GROUP, 2) + Reducer 2 <- Map 5 (GROUP, 4), Map 7 (GROUP, 4) + Reducer 3 <- Map 6 (GROUP, 4), Map 8 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 5 @@ -341,9 +341,9 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 5 <- Map 4 (GROUP, 2) - Reducer 3 <- Reducer 2 (GROUP PARTITION-LEVEL SORT, 2), Reducer 5 (GROUP PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 5 <- Map 4 (GROUP, 4) + Reducer 3 <- Reducer 2 (GROUP PARTITION-LEVEL SORT, 4), Reducer 5 (GROUP PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -628,8 +628,8 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 3 <- Map 4 (GROUP PARTITION-LEVEL SORT, 2), Reducer 2 (GROUP PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 3 <- Map 4 (GROUP PARTITION-LEVEL SORT, 4), Reducer 2 (GROUP PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/union32.q.out b/ql/src/test/results/clientpositive/spark/union32.q.out index c8909a5..e406c9e 100644 --- a/ql/src/test/results/clientpositive/spark/union32.q.out +++ b/ql/src/test/results/clientpositive/spark/union32.q.out @@ -153,7 +153,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -287,7 +287,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 3 <- Map 2 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) + Reducer 3 <- Map 2 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -421,7 +421,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -555,7 +555,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 3 <- Map 2 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) + Reducer 3 <- Map 2 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/union33.q.out b/ql/src/test/results/clientpositive/spark/union33.q.out index 2de2984..f346156 100644 --- a/ql/src/test/results/clientpositive/spark/union33.q.out +++ b/ql/src/test/results/clientpositive/spark/union33.q.out @@ -41,8 +41,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 3 <- Map 2 (GROUP PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (GROUP, 2) + Reducer 3 <- Map 2 (GROUP PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -187,8 +187,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/union34.q.out b/ql/src/test/results/clientpositive/spark/union34.q.out index d5e7e4a..b179186 100644 --- a/ql/src/test/results/clientpositive/spark/union34.q.out +++ b/ql/src/test/results/clientpositive/spark/union34.q.out @@ -261,7 +261,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) Reducer 3 <- Map 5 (SORT, 1), Map 6 (SORT, 1), Reducer 2 (SORT, 1) #### A masked pattern was here #### Vertices: diff --git a/ql/src/test/results/clientpositive/spark/union5.q.out b/ql/src/test/results/clientpositive/spark/union5.q.out index f8cd94b..9dcbc4c 100644 --- a/ql/src/test/results/clientpositive/spark/union5.q.out +++ b/ql/src/test/results/clientpositive/spark/union5.q.out @@ -24,7 +24,7 @@ STAGE PLANS: Edges: Reducer 2 <- Map 1 (GROUP, 1) Reducer 5 <- Map 4 (GROUP, 1) - Reducer 3 <- Reducer 2 (GROUP, 2), Reducer 5 (GROUP, 2) + Reducer 3 <- Reducer 2 (GROUP, 4), Reducer 5 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -137,5 +137,5 @@ POSTHOOK: query: select unionsrc.key, count(1) FROM (select 'tst1' as key, count POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### -tst2 1 tst1 1 +tst2 1 diff --git a/ql/src/test/results/clientpositive/spark/union7.q.out b/ql/src/test/results/clientpositive/spark/union7.q.out index 73042d6..b5bff89 100644 --- a/ql/src/test/results/clientpositive/spark/union7.q.out +++ b/ql/src/test/results/clientpositive/spark/union7.q.out @@ -23,7 +23,7 @@ STAGE PLANS: Spark Edges: Reducer 2 <- Map 1 (GROUP, 1) - Reducer 3 <- Map 4 (GROUP, 2), Reducer 2 (GROUP, 2) + Reducer 3 <- Map 4 (GROUP, 4), Reducer 2 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -120,20 +120,20 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@src1 #### A masked pattern was here #### +213 1 +150 1 +66 1 + 10 +tst1 1 +224 1 238 1 311 1 146 1 278 1 -401 1 128 1 98 1 255 1 -213 1 -150 1 369 1 -66 1 - 10 406 1 -tst1 1 273 1 -224 1 +401 1 diff --git a/ql/src/test/results/clientpositive/spark/union_lateralview.q.out b/ql/src/test/results/clientpositive/spark/union_lateralview.q.out index 126ca0c..da8a9f0 100644 --- a/ql/src/test/results/clientpositive/spark/union_lateralview.q.out +++ b/ql/src/test/results/clientpositive/spark/union_lateralview.q.out @@ -53,7 +53,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/union_ppr.q.out b/ql/src/test/results/clientpositive/spark/union_ppr.q.out index 5d77bef..15ebd41 100644 --- a/ql/src/test/results/clientpositive/spark/union_ppr.q.out +++ b/ql/src/test/results/clientpositive/spark/union_ppr.q.out @@ -116,7 +116,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/union_remove_1.q.out b/ql/src/test/results/clientpositive/spark/union_remove_1.q.out index 027ede7..9d3de80 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_1.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_1.q.out @@ -68,8 +68,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 4 <- Map 3 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 4 <- Map 3 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -195,7 +195,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE false - numFiles 4 + numFiles 8 numRows -1 rawDataSize -1 totalSize 40 diff --git a/ql/src/test/results/clientpositive/spark/union_remove_10.q.out b/ql/src/test/results/clientpositive/spark/union_remove_10.q.out index 2bc06d3..89bc8a3 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_10.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_10.q.out @@ -89,7 +89,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 3 <- Map 2 (GROUP, 2) + Reducer 3 <- Map 2 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -253,10 +253,10 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE false - numFiles 4 + numFiles 6 numRows -1 rawDataSize -1 - totalSize 350 + totalSize 502 #### A masked pattern was here #### # Storage Information diff --git a/ql/src/test/results/clientpositive/spark/union_remove_13.q.out b/ql/src/test/results/clientpositive/spark/union_remove_13.q.out index bf25b54..cfb5af5 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_13.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_13.q.out @@ -101,7 +101,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -267,10 +267,10 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE false - numFiles 3 + numFiles 5 numRows -1 rawDataSize -1 - totalSize 271 + totalSize 423 #### A masked pattern was here #### # Storage Information diff --git a/ql/src/test/results/clientpositive/spark/union_remove_15.q.out b/ql/src/test/results/clientpositive/spark/union_remove_15.q.out index 1f1e3c8..e022c66 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_15.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_15.q.out @@ -74,8 +74,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 4 <- Map 3 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 4 <- Map 3 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/union_remove_16.q.out b/ql/src/test/results/clientpositive/spark/union_remove_16.q.out index f17b7a4..0a06df9 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_16.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_16.q.out @@ -77,8 +77,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 4 <- Map 3 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 4 <- Map 3 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/union_remove_18.q.out b/ql/src/test/results/clientpositive/spark/union_remove_18.q.out index 4b71e77..1024d87 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_18.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_18.q.out @@ -72,8 +72,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 4 <- Map 3 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 4 <- Map 3 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/union_remove_19.q.out b/ql/src/test/results/clientpositive/spark/union_remove_19.q.out index 290d11a..eb54c8d 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_19.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_19.q.out @@ -72,8 +72,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 4 <- Map 3 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 4 <- Map 3 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -199,7 +199,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE false - numFiles 4 + numFiles 8 numRows -1 rawDataSize -1 totalSize 40 @@ -261,8 +261,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 4 <- Map 3 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 4 <- Map 3 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -430,8 +430,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 4 <- Map 3 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 4 <- Map 3 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/union_remove_2.q.out b/ql/src/test/results/clientpositive/spark/union_remove_2.q.out index 06d4ad8..626f691 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_2.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_2.q.out @@ -74,7 +74,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -197,7 +197,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE false - numFiles 4 + numFiles 6 numRows -1 rawDataSize -1 totalSize 68 diff --git a/ql/src/test/results/clientpositive/spark/union_remove_20.q.out b/ql/src/test/results/clientpositive/spark/union_remove_20.q.out index bd8f9d7..8e65ad0 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_20.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_20.q.out @@ -70,8 +70,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 4 <- Map 3 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 4 <- Map 3 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -203,7 +203,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE false - numFiles 4 + numFiles 8 numRows -1 rawDataSize -1 totalSize 40 diff --git a/ql/src/test/results/clientpositive/spark/union_remove_21.q.out b/ql/src/test/results/clientpositive/spark/union_remove_21.q.out index 9379e34..dbc54ca 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_21.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_21.q.out @@ -70,8 +70,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 4 <- Map 3 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 4 <- Map 3 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -207,7 +207,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE false - numFiles 4 + numFiles 8 numRows -1 rawDataSize -1 totalSize 20 diff --git a/ql/src/test/results/clientpositive/spark/union_remove_22.q.out b/ql/src/test/results/clientpositive/spark/union_remove_22.q.out index 8fe568a..448a33a 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_22.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_22.q.out @@ -72,8 +72,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 4 <- Map 3 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 4 <- Map 3 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -207,7 +207,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE false - numFiles 4 + numFiles 8 numRows -1 rawDataSize -1 totalSize 60 @@ -267,8 +267,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 4 <- Map 3 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 4 <- Map 3 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/union_remove_23.q.out b/ql/src/test/results/clientpositive/spark/union_remove_23.q.out index 4add1d6..1f265d8 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_23.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_23.q.out @@ -72,9 +72,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 6 <- Map 5 (GROUP, 2) - Reducer 3 <- Reducer 2 (GROUP, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 6 <- Map 5 (GROUP, 4) + Reducer 3 <- Reducer 2 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -229,7 +229,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE false - numFiles 4 + numFiles 8 numRows -1 rawDataSize -1 totalSize 40 diff --git a/ql/src/test/results/clientpositive/spark/union_remove_24.q.out b/ql/src/test/results/clientpositive/spark/union_remove_24.q.out index 881e4ed..f08ff4c 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_24.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_24.q.out @@ -66,8 +66,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 4 <- Map 3 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 4 <- Map 3 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -199,7 +199,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE false - numFiles 4 + numFiles 8 numRows -1 rawDataSize -1 totalSize 60 diff --git a/ql/src/test/results/clientpositive/spark/union_remove_25.q.out b/ql/src/test/results/clientpositive/spark/union_remove_25.q.out index f32aaea..c025b7e 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_25.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_25.q.out @@ -84,8 +84,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 4 <- Map 3 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 4 <- Map 3 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -218,7 +218,7 @@ Protect Mode: None #### A masked pattern was here #### Partition Parameters: COLUMN_STATS_ACCURATE false - numFiles 4 + numFiles 8 numRows -1 rawDataSize -1 totalSize 40 diff --git a/ql/src/test/results/clientpositive/spark/union_remove_4.q.out b/ql/src/test/results/clientpositive/spark/union_remove_4.q.out index 5d6dd88..ba87d54 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_4.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_4.q.out @@ -73,8 +73,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 4 <- Map 3 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 4 <- Map 3 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -245,7 +245,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE false - numFiles 4 + numFiles 8 numRows -1 rawDataSize -1 totalSize 40 diff --git a/ql/src/test/results/clientpositive/spark/union_remove_5.q.out b/ql/src/test/results/clientpositive/spark/union_remove_5.q.out index 554cffc..8292c8c 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_5.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_5.q.out @@ -81,7 +81,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -249,7 +249,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE false - numFiles 4 + numFiles 6 numRows -1 rawDataSize -1 totalSize 68 diff --git a/ql/src/test/results/clientpositive/spark/union_remove_6.q.out b/ql/src/test/results/clientpositive/spark/union_remove_6.q.out index ea0a1a0..581da90 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_6.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_6.q.out @@ -71,8 +71,8 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 4 <- Map 3 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 4 <- Map 3 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/union_remove_6_subq.q.out b/ql/src/test/results/clientpositive/spark/union_remove_6_subq.q.out index 977d0f5..dfb2b97 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_6_subq.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_6_subq.q.out @@ -79,8 +79,8 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 4 <- Map 3 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 4 <- Map 3 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -406,10 +406,10 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 6 <- Map 5 (GROUP, 2) - Reducer 3 <- Reducer 2 (GROUP, 2), Reducer 6 (GROUP, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 6 <- Map 5 (GROUP, 4) + Reducer 3 <- Reducer 2 (GROUP, 4), Reducer 6 (GROUP, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/union_remove_7.q.out b/ql/src/test/results/clientpositive/spark/union_remove_7.q.out index d8f4c03..3c2d158 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_7.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_7.q.out @@ -72,8 +72,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) - Reducer 4 <- Map 3 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) + Reducer 4 <- Map 3 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -199,10 +199,10 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE false - numFiles 4 + numFiles 8 numRows -1 rawDataSize -1 - totalSize 336 + totalSize 640 #### A masked pattern was here #### # Storage Information diff --git a/ql/src/test/results/clientpositive/spark/union_remove_8.q.out b/ql/src/test/results/clientpositive/spark/union_remove_8.q.out index 994552e..16e1bd6 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_8.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_8.q.out @@ -78,7 +78,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -201,10 +201,10 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE false - numFiles 4 + numFiles 6 numRows -1 rawDataSize -1 - totalSize 350 + totalSize 502 #### A masked pattern was here #### # Storage Information diff --git a/ql/src/test/results/clientpositive/spark/union_remove_9.q.out b/ql/src/test/results/clientpositive/spark/union_remove_9.q.out index a16ca19..0d9a047 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_9.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_9.q.out @@ -85,7 +85,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -255,10 +255,10 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE false - numFiles 4 + numFiles 6 numRows -1 rawDataSize -1 - totalSize 350 + totalSize 502 #### A masked pattern was here #### # Storage Information diff --git a/ql/src/test/results/clientpositive/spark/union_top_level.q.out b/ql/src/test/results/clientpositive/spark/union_top_level.q.out index f57fc04..6221c81 100644 --- a/ql/src/test/results/clientpositive/spark/union_top_level.q.out +++ b/ql/src/test/results/clientpositive/spark/union_top_level.q.out @@ -177,8 +177,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) - Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 2), Map 8 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL SORT, 4) + Reducer 6 <- Map 5 (PARTITION-LEVEL SORT, 4), Map 8 (PARTITION-LEVEL SORT, 4) Reducer 3 <- Reducer 2 (GROUP, 1) Reducer 7 <- Reducer 6 (GROUP, 1) #### A masked pattern was here #### @@ -343,23 +343,23 @@ POSTHOOK: Input: default@src 0 val_0 0 val_0 0 val_0 -0 val_0 -0 val_0 -0 val_0 -0 val_0 -0 val_0 -10 val_10 -10 val_10 100 val_100 100 val_100 103 val_103 103 val_103 -104 val_104 -104 val_104 -104 val_104 -104 val_104 -111 val_111 111 val_111 +113 val_113 +113 val_113 +119 val_119 +119 val_119 +120 val_120 +128 val_128 +128 val_128 +134 val_134 +134 val_134 +138 val_138 +138 val_138 +138 val_138 PREHOOK: query: -- ctas explain create table union_top as diff --git a/ql/src/test/results/clientpositive/spark/vector_cast_constant.q.java1.7.out b/ql/src/test/results/clientpositive/spark/vector_cast_constant.q.java1.7.out index e159c8b..9e53e49 100644 --- a/ql/src/test/results/clientpositive/spark/vector_cast_constant.q.java1.7.out +++ b/ql/src/test/results/clientpositive/spark/vector_cast_constant.q.java1.7.out @@ -123,7 +123,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -191,13 +191,13 @@ POSTHOOK: query: SELECT POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### -65598 50.0 50.0 50 -65694 50.0 50.0 50 -65678 50.0 50.0 50 +65640 50.0 50.0 50 +65592 50.0 50.0 50 +65700 50.0 50.0 50 +65704 50.0 50.0 50 65684 50.0 50.0 50 +65696 50.0 50.0 50 +65652 50.0 50.0 50 65596 50.0 50.0 50 65692 50.0 50.0 50 -65630 50.0 50.0 50 -65674 50.0 50.0 50 -65628 50.0 50.0 50 -65776 50.0 50.0 50 +65744 50.0 50.0 50 diff --git a/ql/src/test/results/clientpositive/spark/vector_data_types.q.out b/ql/src/test/results/clientpositive/spark/vector_data_types.q.out index 98cfb7d..a959964 100644 --- a/ql/src/test/results/clientpositive/spark/vector_data_types.q.out +++ b/ql/src/test/results/clientpositive/spark/vector_data_types.q.out @@ -97,9 +97,9 @@ POSTHOOK: Lineage: over1korc.s SIMPLE [(over1k)over1k.FieldSchema(name:s, type:s POSTHOOK: Lineage: over1korc.si SIMPLE [(over1k)over1k.FieldSchema(name:si, type:smallint, comment:null), ] POSTHOOK: Lineage: over1korc.t SIMPLE [(over1k)over1k.FieldSchema(name:t, type:tinyint, comment:null), ] POSTHOOK: Lineage: over1korc.ts SIMPLE [(over1k)over1k.FieldSchema(name:ts, type:timestamp, comment:null), ] -PREHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +PREHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +POSTHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -122,14 +122,14 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10 Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator - key expressions: _col2 (type: int) - sort order: + + key expressions: _col0 (type: tinyint), _col1 (type: smallint), _col2 (type: int) + sort order: +++ Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: tinyint), _col1 (type: smallint), _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: boolean), _col7 (type: string), _col8 (type: timestamp), _col9 (type: decimal(4,2)), _col10 (type: binary) + value expressions: _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: boolean), _col7 (type: string), _col8 (type: timestamp), _col9 (type: decimal(4,2)), _col10 (type: binary) Reducer 2 Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: tinyint), VALUE._col1 (type: smallint), KEY.reducesinkkey0 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: double), VALUE._col5 (type: boolean), VALUE._col6 (type: string), VALUE._col7 (type: timestamp), VALUE._col8 (type: decimal(4,2)), VALUE._col9 (type: binary) + expressions: KEY.reducesinkkey0 (type: tinyint), KEY.reducesinkkey1 (type: smallint), KEY.reducesinkkey2 (type: int), VALUE._col0 (type: bigint), VALUE._col1 (type: float), VALUE._col2 (type: double), VALUE._col3 (type: boolean), VALUE._col4 (type: string), VALUE._col5 (type: timestamp), VALUE._col6 (type: decimal(4,2)), VALUE._col7 (type: binary) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10 Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE Limit @@ -149,48 +149,48 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### -POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### +NULL 374 65560 4294967516 65.43 22.48 true oscar quirinius 2013-03-01 09:11:58.703316 16.86 mathematics NULL 409 65536 4294967490 46.97 25.92 false fred miller 2013-03-01 09:11:58.703116 33.45 history -18 280 65536 4294967320 32.92 45.94 false holly white 2013-03-01 09:11:58.703086 58.86 topology -69 489 65536 4294967404 33.52 17.99 false oscar ichabod 2013-03-01 09:11:58.703247 32.68 topology -108 301 65536 4294967357 90.05 17.59 true ethan johnson 2013-03-01 09:11:58.703271 75.7 undecided -27 405 65536 4294967508 82.24 29.41 true oscar ovid 2013-03-01 09:11:58.703166 16.85 biology -42 495 65536 4294967431 43.57 46.81 false tom johnson 2013-03-01 09:11:58.703245 62.25 american history -118 497 65536 4294967381 50.32 12.72 false david nixon 2013-03-01 09:11:58.703285 83.48 values clariffication -72 267 65537 4294967460 55.2 42.89 false oscar carson 2013-03-01 09:11:58.703153 51.91 topology -22 264 65537 4294967419 8.07 10.71 false david xylophone 2013-03-01 09:11:58.703136 11.87 undecided -63 458 65537 4294967463 21.94 49.71 true fred van buren 2013-03-01 09:11:58.703278 99.34 wind surfing -121 355 65537 4294967437 85.9 10.99 true calvin brown 2013-03-01 09:11:58.703254 4.49 yard duty -59 431 65537 4294967326 11.34 2.9 true oscar robinson 2013-03-01 09:11:58.703161 81.04 zync studies -83 353 65538 4294967339 0.08 23.91 true holly thompson 2013-03-01 09:11:58.703157 30.27 quiet hour -109 376 65538 4294967453 59.61 35.62 true priscilla xylophone 2013-03-01 09:11:58.703286 9.53 study skills -101 283 65538 4294967527 84.03 27.29 true yuri brown 2013-03-01 09:11:58.703306 44.24 biology -120 331 65539 4294967324 88.02 40.94 true holly nixon 2013-03-01 09:11:58.703262 96.64 yard duty -70 430 65539 4294967534 18.89 43.84 true tom carson 2013-03-01 09:11:58.703182 21.93 joggying -29 331 65539 4294967420 73.18 28.96 true ethan brown 2013-03-01 09:11:58.703094 58.85 zync studies -71 298 65540 4294967510 91.63 9.6 false gabriella zipper 2013-03-01 09:11:58.70314 68.14 geology -89 466 65541 4294967468 85.51 19.79 true calvin davidson 2013-03-01 09:11:58.703113 35.38 philosophy +NULL 473 65720 4294967324 80.74 40.6 false holly falkner 2013-03-01 09:11:58.703111 18.8 mathematics +-3 275 65622 4294967302 71.78 8.49 false wendy robinson 2013-03-01 09:11:58.703294 95.39 undecided +-3 344 65733 4294967363 0.56 11.96 true rachel thompson 2013-03-01 09:11:58.703276 88.46 wind surfing +-3 376 65548 4294967431 96.78 43.23 false fred ellison 2013-03-01 09:11:58.703233 75.39 education +-3 438 65618 4294967398 62.39 4.62 false victor xylophone 2013-03-01 09:11:58.703135 88.38 values clariffication +-3 458 65696 4294967418 45.24 8.49 false irene ellison 2013-03-01 09:11:58.703092 54.02 american history +-3 467 65575 4294967437 81.64 23.53 true tom hernandez 2013-03-01 09:11:58.703188 32.85 study skills +-2 261 65603 4294967332 39.18 28.98 false fred polk 2013-03-01 09:11:58.70331 69.26 opthamology +-2 269 65681 4294967544 99.24 28.19 false rachel falkner 2013-03-01 09:11:58.703089 41.57 quiet hour +-2 288 65658 4294967383 53.78 19.92 false holly nixon 2013-03-01 09:11:58.703224 42.93 industrial engineering +-2 304 65629 4294967386 84.38 33.49 false zach garcia 2013-03-01 09:11:58.703264 56.99 chemistry +-2 340 65627 4294967533 76.52 21.91 true quinn laertes 2013-03-01 09:11:58.703178 93.29 xylophone band +-2 427 65666 4294967465 19.69 33.24 true bob xylophone 2013-03-01 09:11:58.703219 32.73 joggying +-2 429 65664 4294967441 45.19 40.43 false wendy king 2013-03-01 09:11:58.703265 11.46 industrial engineering +-2 461 65648 4294967425 58.52 24.85 false rachel thompson 2013-03-01 09:11:58.703318 85.62 zync studies +-1 268 65778 4294967418 56.33 44.73 true calvin falkner 2013-03-01 09:11:58.70322 7.37 history +-1 281 65643 4294967323 15.1 45.0 false irene nixon 2013-03-01 09:11:58.703223 80.96 undecided +-1 300 65663 4294967343 71.26 34.62 true calvin ovid 2013-03-01 09:11:58.703262 78.56 study skills PREHOOK: query: 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 PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### POSTHOOK: query: 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 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### -17045922556 -PREHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +PREHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +POSTHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -213,15 +213,15 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10 Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator - key expressions: _col2 (type: int) - sort order: + + key expressions: _col0 (type: tinyint), _col1 (type: smallint), _col2 (type: int) + sort order: +++ Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: tinyint), _col1 (type: smallint), _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: boolean), _col7 (type: string), _col8 (type: timestamp), _col9 (type: decimal(4,2)), _col10 (type: binary) + value expressions: _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: boolean), _col7 (type: string), _col8 (type: timestamp), _col9 (type: decimal(4,2)), _col10 (type: binary) Execution mode: vectorized Reducer 2 Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: tinyint), VALUE._col1 (type: smallint), KEY.reducesinkkey0 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: double), VALUE._col5 (type: boolean), VALUE._col6 (type: string), VALUE._col7 (type: timestamp), VALUE._col8 (type: decimal(4,2)), VALUE._col9 (type: binary) + expressions: KEY.reducesinkkey0 (type: tinyint), KEY.reducesinkkey1 (type: smallint), KEY.reducesinkkey2 (type: int), VALUE._col0 (type: bigint), VALUE._col1 (type: float), VALUE._col2 (type: double), VALUE._col3 (type: boolean), VALUE._col4 (type: string), VALUE._col5 (type: timestamp), VALUE._col6 (type: decimal(4,2)), VALUE._col7 (type: binary) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10 Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE Limit @@ -242,41 +242,41 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### -POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### +NULL 374 65560 4294967516 65.43 22.48 true oscar quirinius 2013-03-01 09:11:58.703316 16.86 mathematics NULL 409 65536 4294967490 46.97 25.92 false fred miller 2013-03-01 09:11:58.703116 33.45 history -18 280 65536 4294967320 32.92 45.94 false holly white 2013-03-01 09:11:58.703086 58.86 topology -69 489 65536 4294967404 33.52 17.99 false oscar ichabod 2013-03-01 09:11:58.703247 32.68 topology -108 301 65536 4294967357 90.05 17.59 true ethan johnson 2013-03-01 09:11:58.703271 75.7 undecided -27 405 65536 4294967508 82.24 29.41 true oscar ovid 2013-03-01 09:11:58.703166 16.85 biology -42 495 65536 4294967431 43.57 46.81 false tom johnson 2013-03-01 09:11:58.703245 62.25 american history -118 497 65536 4294967381 50.32 12.72 false david nixon 2013-03-01 09:11:58.703285 83.48 values clariffication -72 267 65537 4294967460 55.2 42.89 false oscar carson 2013-03-01 09:11:58.703153 51.91 topology -22 264 65537 4294967419 8.07 10.71 false david xylophone 2013-03-01 09:11:58.703136 11.87 undecided -63 458 65537 4294967463 21.94 49.71 true fred van buren 2013-03-01 09:11:58.703278 99.34 wind surfing -121 355 65537 4294967437 85.9 10.99 true calvin brown 2013-03-01 09:11:58.703254 4.49 yard duty -59 431 65537 4294967326 11.34 2.9 true oscar robinson 2013-03-01 09:11:58.703161 81.04 zync studies -83 353 65538 4294967339 0.08 23.91 true holly thompson 2013-03-01 09:11:58.703157 30.27 quiet hour -109 376 65538 4294967453 59.61 35.62 true priscilla xylophone 2013-03-01 09:11:58.703286 9.53 study skills -101 283 65538 4294967527 84.03 27.29 true yuri brown 2013-03-01 09:11:58.703306 44.24 biology -120 331 65539 4294967324 88.02 40.94 true holly nixon 2013-03-01 09:11:58.703262 96.64 yard duty -70 430 65539 4294967534 18.89 43.84 true tom carson 2013-03-01 09:11:58.703182 21.93 joggying -29 331 65539 4294967420 73.18 28.96 true ethan brown 2013-03-01 09:11:58.703094 58.85 zync studies -71 298 65540 4294967510 91.63 9.6 false gabriella zipper 2013-03-01 09:11:58.70314 68.14 geology -89 466 65541 4294967468 85.51 19.79 true calvin davidson 2013-03-01 09:11:58.703113 35.38 philosophy +NULL 473 65720 4294967324 80.74 40.6 false holly falkner 2013-03-01 09:11:58.703111 18.8 mathematics +-3 275 65622 4294967302 71.78 8.49 false wendy robinson 2013-03-01 09:11:58.703294 95.39 undecided +-3 344 65733 4294967363 0.56 11.96 true rachel thompson 2013-03-01 09:11:58.703276 88.46 wind surfing +-3 376 65548 4294967431 96.78 43.23 false fred ellison 2013-03-01 09:11:58.703233 75.39 education +-3 438 65618 4294967398 62.39 4.62 false victor xylophone 2013-03-01 09:11:58.703135 88.38 values clariffication +-3 458 65696 4294967418 45.24 8.49 false irene ellison 2013-03-01 09:11:58.703092 54.02 american history +-3 467 65575 4294967437 81.64 23.53 true tom hernandez 2013-03-01 09:11:58.703188 32.85 study skills +-2 261 65603 4294967332 39.18 28.98 false fred polk 2013-03-01 09:11:58.70331 69.26 opthamology +-2 269 65681 4294967544 99.24 28.19 false rachel falkner 2013-03-01 09:11:58.703089 41.57 quiet hour +-2 288 65658 4294967383 53.78 19.92 false holly nixon 2013-03-01 09:11:58.703224 42.93 industrial engineering +-2 304 65629 4294967386 84.38 33.49 false zach garcia 2013-03-01 09:11:58.703264 56.99 chemistry +-2 340 65627 4294967533 76.52 21.91 true quinn laertes 2013-03-01 09:11:58.703178 93.29 xylophone band +-2 427 65666 4294967465 19.69 33.24 true bob xylophone 2013-03-01 09:11:58.703219 32.73 joggying +-2 429 65664 4294967441 45.19 40.43 false wendy king 2013-03-01 09:11:58.703265 11.46 industrial engineering +-2 461 65648 4294967425 58.52 24.85 false rachel thompson 2013-03-01 09:11:58.703318 85.62 zync studies +-1 268 65778 4294967418 56.33 44.73 true calvin falkner 2013-03-01 09:11:58.70322 7.37 history +-1 281 65643 4294967323 15.1 45.0 false irene nixon 2013-03-01 09:11:58.703223 80.96 undecided +-1 300 65663 4294967343 71.26 34.62 true calvin ovid 2013-03-01 09:11:58.703262 78.56 study skills PREHOOK: query: 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 PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### POSTHOOK: query: 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 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/vector_decimal_aggregate.q.out b/ql/src/test/results/clientpositive/spark/vector_decimal_aggregate.q.out index cb2d56b..8966572 100644 --- a/ql/src/test/results/clientpositive/spark/vector_decimal_aggregate.q.out +++ b/ql/src/test/results/clientpositive/spark/vector_decimal_aggregate.q.out @@ -44,7 +44,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -149,7 +149,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/vector_distinct_2.q.out b/ql/src/test/results/clientpositive/spark/vector_distinct_2.q.out index 23f2b98..d3f194f 100644 --- a/ql/src/test/results/clientpositive/spark/vector_distinct_2.q.out +++ b/ql/src/test/results/clientpositive/spark/vector_distinct_2.q.out @@ -119,7 +119,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/vector_groupby_3.q.out b/ql/src/test/results/clientpositive/spark/vector_groupby_3.q.out index 6f62820..0921992 100644 --- a/ql/src/test/results/clientpositive/spark/vector_groupby_3.q.out +++ b/ql/src/test/results/clientpositive/spark/vector_groupby_3.q.out @@ -119,7 +119,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/vector_mapjoin_reduce.q.out b/ql/src/test/results/clientpositive/spark/vector_mapjoin_reduce.q.out index 02c1fc6..2d3c7a2 100644 --- a/ql/src/test/results/clientpositive/spark/vector_mapjoin_reduce.q.out +++ b/ql/src/test/results/clientpositive/spark/vector_mapjoin_reduce.q.out @@ -73,7 +73,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -231,7 +231,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/vector_orderby_5.q.out b/ql/src/test/results/clientpositive/spark/vector_orderby_5.q.out index 3363c8b..7d9c3ea 100644 --- a/ql/src/test/results/clientpositive/spark/vector_orderby_5.q.out +++ b/ql/src/test/results/clientpositive/spark/vector_orderby_5.q.out @@ -115,7 +115,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) Reducer 3 <- Reducer 2 (SORT, 1) #### A masked pattern was here #### Vertices: diff --git a/ql/src/test/results/clientpositive/spark/vector_string_concat.q.out b/ql/src/test/results/clientpositive/spark/vector_string_concat.q.out index 9ec8538..25d8c12 100644 --- a/ql/src/test/results/clientpositive/spark/vector_string_concat.q.out +++ b/ql/src/test/results/clientpositive/spark/vector_string_concat.q.out @@ -290,7 +290,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) Reducer 3 <- Reducer 2 (SORT, 1) #### A masked pattern was here #### Vertices: diff --git a/ql/src/test/results/clientpositive/spark/vectorization_13.q.out b/ql/src/test/results/clientpositive/spark/vectorization_13.q.out index 41ee583..98e3e2a 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_13.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_13.q.out @@ -72,7 +72,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) Reducer 3 <- Reducer 2 (SORT, 1) #### A masked pattern was here #### Vertices: @@ -326,7 +326,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) Reducer 3 <- Reducer 2 (SORT, 1) #### A masked pattern was here #### Vertices: diff --git a/ql/src/test/results/clientpositive/spark/vectorization_14.q.out b/ql/src/test/results/clientpositive/spark/vectorization_14.q.out index 1de639b..6fcceea 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_14.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_14.q.out @@ -72,7 +72,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) Reducer 3 <- Reducer 2 (SORT, 1) #### A masked pattern was here #### Vertices: diff --git a/ql/src/test/results/clientpositive/spark/vectorization_15.q.out b/ql/src/test/results/clientpositive/spark/vectorization_15.q.out index 960a058..bba0041 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_15.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_15.q.out @@ -68,7 +68,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) Reducer 3 <- Reducer 2 (SORT, 1) #### A masked pattern was here #### Vertices: diff --git a/ql/src/test/results/clientpositive/spark/vectorization_16.q.out b/ql/src/test/results/clientpositive/spark/vectorization_16.q.out index 473eaf4..536997f 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_16.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_16.q.out @@ -50,7 +50,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/vectorization_9.q.out b/ql/src/test/results/clientpositive/spark/vectorization_9.q.out index 17b35fe..d9840a7 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_9.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_9.q.out @@ -46,7 +46,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/vectorization_part_project.q.out b/ql/src/test/results/clientpositive/spark/vectorization_part_project.q.out index 0f10727..f92e823 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_part_project.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_part_project.q.out @@ -6,11 +6,11 @@ POSTHOOK: query: CREATE TABLE alltypesorc_part(ctinyint tinyint, csmallint small POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@alltypesorc_part -PREHOOK: query: insert overwrite table alltypesorc_part partition (ds='2011') select * from alltypesorc limit 100 +PREHOOK: query: insert overwrite table alltypesorc_part partition (ds='2011') select * from alltypesorc order by ctinyint, cint, cbigint limit 100 PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc PREHOOK: Output: default@alltypesorc_part@ds=2011 -POSTHOOK: query: insert overwrite table alltypesorc_part partition (ds='2011') select * from alltypesorc limit 100 +POSTHOOK: query: insert overwrite table alltypesorc_part partition (ds='2011') select * from alltypesorc order by ctinyint, cint, cbigint limit 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc POSTHOOK: Output: default@alltypesorc_part@ds=2011 @@ -26,11 +26,11 @@ POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring2 SIMPLE [(alltype POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:null), ] POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:null), ] -PREHOOK: query: insert overwrite table alltypesorc_part partition (ds='2012') select * from alltypesorc limit 100 +PREHOOK: query: insert overwrite table alltypesorc_part partition (ds='2012') select * from alltypesorc order by ctinyint, cint, cbigint limit 100 PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc PREHOOK: Output: default@alltypesorc_part@ds=2012 -POSTHOOK: query: insert overwrite table alltypesorc_part partition (ds='2012') select * from alltypesorc limit 100 +POSTHOOK: query: insert overwrite table alltypesorc_part partition (ds='2012') select * from alltypesorc order by ctinyint, cint, cbigint limit 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc POSTHOOK: Output: default@alltypesorc_part@ds=2012 @@ -65,28 +65,28 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc_part - Statistics: Num rows: 200 Data size: 41576 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 200 Data size: 54496 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (cdouble + 2) (type: double) outputColumnNames: _col0 - Statistics: Num rows: 200 Data size: 41576 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 200 Data size: 54496 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: double) sort order: + - Statistics: Num rows: 200 Data size: 41576 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 200 Data size: 54496 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Reducer 2 Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: double) outputColumnNames: _col0 - Statistics: Num rows: 200 Data size: 41576 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 200 Data size: 54496 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 10 - Statistics: Num rows: 10 Data size: 2070 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 2720 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 10 Data size: 2070 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 2720 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -111,13 +111,13 @@ POSTHOOK: Input: default@alltypesorc_part POSTHOOK: Input: default@alltypesorc_part@ds=2011 POSTHOOK: Input: default@alltypesorc_part@ds=2012 #### A masked pattern was here #### --15910.0 --15910.0 --15811.0 --15811.0 --15788.0 --15788.0 --15547.0 --15547.0 --15429.0 --15429.0 +NULL +NULL +-15863.0 +-15863.0 +-14988.0 +-14988.0 +-14646.0 +-14646.0 +-14236.0 +-14236.0 diff --git a/ql/src/test/results/clientpositive/spark/vectorization_short_regress.q.out b/ql/src/test/results/clientpositive/spark/vectorization_short_regress.q.out index a4b8e05..0747972 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_short_regress.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_short_regress.q.out @@ -1866,7 +1866,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) Reducer 3 <- Reducer 2 (SORT, 1) #### A masked pattern was here #### Vertices: @@ -2074,7 +2074,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) Reducer 3 <- Reducer 2 (SORT, 1) #### A masked pattern was here #### Vertices: @@ -2329,7 +2329,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) Reducer 3 <- Reducer 2 (SORT, 1) #### A masked pattern was here #### Vertices: @@ -2662,7 +2662,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP, 2) + Reducer 2 <- Map 1 (GROUP, 4) Reducer 3 <- Reducer 2 (SORT, 1) #### A masked pattern was here #### Vertices: diff --git a/ql/src/test/results/clientpositive/spark/vectorized_mapjoin.q.out b/ql/src/test/results/clientpositive/spark/vectorized_mapjoin.q.out index 29c6c56..8ce8eff 100644 --- a/ql/src/test/results/clientpositive/spark/vectorized_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorized_mapjoin.q.out @@ -1,8 +1,10 @@ -PREHOOK: query: EXPLAIN SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) FROM alltypesorc t1 JOIN alltypesorc t2 ON t1.cint = t2.cint PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) FROM alltypesorc t1 JOIN alltypesorc t2 ON t1.cint = t2.cint POSTHOOK: type: QUERY @@ -88,13 +90,15 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) FROM alltypesorc t1 JOIN alltypesorc t2 ON t1.cint = t2.cint PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc #### A masked pattern was here #### -POSTHOOK: query: SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) FROM alltypesorc t1 JOIN alltypesorc t2 ON t1.cint = t2.cint POSTHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/spark/vectorized_nested_mapjoin.q.out b/ql/src/test/results/clientpositive/spark/vectorized_nested_mapjoin.q.out index c50f6cf..049f59a 100644 --- a/ql/src/test/results/clientpositive/spark/vectorized_nested_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorized_nested_mapjoin.q.out @@ -1,6 +1,8 @@ -PREHOOK: query: explain select sum(t1.td) from (select v1.csmallint as tsi, v1.cdouble as td from alltypesorc v1, alltypesorc v2 where v1.ctinyint=v2.ctinyint) t1 join alltypesorc v3 on t1.tsi=v3.csmallint +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select sum(t1.td) from (select v1.csmallint as tsi, v1.cdouble as td from alltypesorc v1, alltypesorc v2 where v1.ctinyint=v2.ctinyint) t1 join alltypesorc v3 on t1.tsi=v3.csmallint PREHOOK: type: QUERY -POSTHOOK: query: explain select sum(t1.td) from (select v1.csmallint as tsi, v1.cdouble as td from alltypesorc v1, alltypesorc v2 where v1.ctinyint=v2.ctinyint) t1 join alltypesorc v3 on t1.tsi=v3.csmallint +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select sum(t1.td) from (select v1.csmallint as tsi, v1.cdouble as td from alltypesorc v1, alltypesorc v2 where v1.ctinyint=v2.ctinyint) t1 join alltypesorc v3 on t1.tsi=v3.csmallint POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-2 is a root stage @@ -129,11 +131,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select sum(t1.td) from (select v1.csmallint as tsi, v1.cdouble as td from alltypesorc v1, alltypesorc v2 where v1.ctinyint=v2.ctinyint) t1 join alltypesorc v3 on t1.tsi=v3.csmallint +PREHOOK: query: -- SORT_QUERY_RESULTS +select sum(t1.td) from (select v1.csmallint as tsi, v1.cdouble as td from alltypesorc v1, alltypesorc v2 where v1.ctinyint=v2.ctinyint) t1 join alltypesorc v3 on t1.tsi=v3.csmallint PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc #### A masked pattern was here #### -POSTHOOK: query: select sum(t1.td) from (select v1.csmallint as tsi, v1.cdouble as td from alltypesorc v1, alltypesorc v2 where v1.ctinyint=v2.ctinyint) t1 join alltypesorc v3 on t1.tsi=v3.csmallint +POSTHOOK: query: -- SORT_QUERY_RESULTS +select sum(t1.td) from (select v1.csmallint as tsi, v1.cdouble as td from alltypesorc v1, alltypesorc v2 where v1.ctinyint=v2.ctinyint) t1 join alltypesorc v3 on t1.tsi=v3.csmallint POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out b/ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out index 8447c04..205b7e8 100644 --- a/ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out @@ -228,8 +228,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -558,9 +558,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 5 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -907,7 +907,7 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1178,8 +1178,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1511,8 +1511,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -1854,9 +1854,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (GROUP, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (GROUP, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -2169,8 +2169,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Map 4 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Map 4 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -2489,8 +2489,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 2) - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Reducer 4 (PARTITION-LEVEL SORT, 2) + Reducer 4 <- Map 3 (PARTITION-LEVEL SORT, 4) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Reducer 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -2822,8 +2822,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -3143,8 +3143,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -3483,8 +3483,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -3816,9 +3816,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -4231,8 +4231,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -4653,9 +4653,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 2), Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Map 5 (PARTITION-LEVEL SORT, 4), Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -5038,8 +5038,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (GROUP, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (GROUP, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -5320,8 +5320,8 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (GROUP PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -5806,11 +5806,11 @@ STAGE PLANS: Stage: Stage-2 Spark Edges: - Reducer 6 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 7 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 6 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 7 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Reducer 4 (PARTITION-LEVEL SORT, 2) + Reducer 6 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 7 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 6 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 7 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Reducer 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -6440,9 +6440,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -6891,10 +6891,10 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Reducer 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Reducer 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -7325,9 +7325,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -7747,10 +7747,10 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) - Reducer 5 <- Reducer 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) + Reducer 5 <- Reducer 4 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -8241,9 +8241,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 @@ -8678,9 +8678,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2) - Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 2) - Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4) + Reducer 3 <- Reducer 2 (PARTITION-LEVEL SORT, 4) + Reducer 4 <- Reducer 3 (PARTITION-LEVEL SORT, 4) #### A masked pattern was here #### Vertices: Map 1 diff --git a/ql/src/test/results/clientpositive/spark/vectorized_rcfile_columnar.q.out b/ql/src/test/results/clientpositive/spark/vectorized_rcfile_columnar.q.out index ee8959b..c35173e 100644 --- a/ql/src/test/results/clientpositive/spark/vectorized_rcfile_columnar.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorized_rcfile_columnar.q.out @@ -23,12 +23,12 @@ POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@columnTable PREHOOK: query: 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 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@columntable POSTHOOK: query: 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 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@columntable @@ -50,13 +50,13 @@ POSTHOOK: query: SELECT key, value FROM columnTable ORDER BY key POSTHOOK: type: QUERY POSTHOOK: Input: default@columntable #### A masked pattern was here #### -165 val_165 -238 val_238 -255 val_255 -27 val_27 -278 val_278 -311 val_311 -409 val_409 -484 val_484 -86 val_86 -98 val_98 +0 val_0 +0 val_0 +0 val_0 +10 val_10 +100 val_100 +100 val_100 +103 val_103 +103 val_103 +104 val_104 +104 val_104 diff --git a/ql/src/test/results/clientpositive/spark/vectorized_shufflejoin.q.out b/ql/src/test/results/clientpositive/spark/vectorized_shufflejoin.q.out index 720a1a6..2368770 100644 --- a/ql/src/test/results/clientpositive/spark/vectorized_shufflejoin.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorized_shufflejoin.q.out @@ -1,10 +1,10 @@ -PREHOOK: query: EXPLAIN SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) +PREHOOK: query: 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 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) +POSTHOOK: query: 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 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -14,8 +14,9 @@ STAGE PLANS: Stage: Stage-1 Spark Edges: - Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 2), Map 4 (PARTITION-LEVEL SORT, 2) + Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 5 (PARTITION-LEVEL SORT, 4) Reducer 3 <- Reducer 2 (GROUP, 1) + Reducer 4 <- Reducer 3 (SORT, 1) #### A masked pattern was here #### Vertices: Map 1 @@ -32,7 +33,7 @@ STAGE PLANS: Map-reduce partition columns: cint (type: int) Statistics: Num rows: 6144 Data size: 188618 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized - Map 4 + Map 5 Map Operator Tree: TableScan alias: t2 @@ -72,6 +73,17 @@ STAGE PLANS: mode: mergepartial outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col0 (type: bigint) + sort order: + + Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: int), _col2 (type: int), _col3 (type: double) + Reducer 4 + Reduce Operator Tree: + Select Operator + expressions: KEY.reducesinkkey0 (type: bigint), VALUE._col0 (type: int), VALUE._col1 (type: int), VALUE._col2 (type: double) + outputColumnNames: _col0, _col1, _col2, _col3 + Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE @@ -79,6 +91,7 @@ STAGE PLANS: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + Execution mode: vectorized Stage: Stage-0 Fetch Operator @@ -86,15 +99,15 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) +PREHOOK: query: 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 + JOIN alltypesorc t2 ON t1.cint = t2.cint order by CNT PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc #### A masked pattern was here #### -POSTHOOK: query: SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) +POSTHOOK: query: 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 + JOIN alltypesorc t2 ON t1.cint = t2.cint order by CNT POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/vectorized_timestamp_funcs.q.out b/ql/src/test/results/clientpositive/spark/vectorized_timestamp_funcs.q.out index 3a0c3f1..18bbf27 100644 --- a/ql/src/test/results/clientpositive/spark/vectorized_timestamp_funcs.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorized_timestamp_funcs.q.out @@ -18,18 +18,20 @@ POSTHOOK: Output: database:default POSTHOOK: Output: default@alltypesorc_string PREHOOK: query: 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 PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc PREHOOK: Output: default@alltypesorc_string POSTHOOK: query: 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 POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc @@ -112,15 +114,15 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc_string - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: to_unix_timestamp(ctimestamp1) (type: bigint), year(ctimestamp1) (type: int), month(ctimestamp1) (type: int), day(ctimestamp1) (type: int), dayofmonth(ctimestamp1) (type: int), weekofyear(ctimestamp1) (type: int), hour(ctimestamp1) (type: int), minute(ctimestamp1) (type: int), second(ctimestamp1) (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8 - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: bigint) sort order: + - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col7 (type: int), _col8 (type: int) Execution mode: vectorized Reducer 2 @@ -128,10 +130,10 @@ STAGE PLANS: Select Operator expressions: KEY.reducesinkkey0 (type: bigint), VALUE._col0 (type: int), VALUE._col1 (type: int), VALUE._col2 (type: int), VALUE._col3 (type: int), VALUE._col4 (type: int), VALUE._col5 (type: int), VALUE._col6 (type: int), VALUE._col7 (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8 - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -175,45 +177,45 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc_string #### A masked pattern was here #### NULL NULL NULL NULL NULL NULL NULL NULL NULL -28784 1969 12 31 31 1 23 59 44 -28784 1969 12 31 31 1 23 59 44 -28784 1969 12 31 31 1 23 59 44 -28784 1969 12 31 31 1 23 59 44 -28785 1969 12 31 31 1 23 59 45 -28786 1969 12 31 31 1 23 59 46 -28787 1969 12 31 31 1 23 59 47 -28788 1969 12 31 31 1 23 59 48 -28789 1969 12 31 31 1 23 59 49 -28789 1969 12 31 31 1 23 59 49 -28790 1969 12 31 31 1 23 59 50 -28792 1969 12 31 31 1 23 59 52 -28792 1969 12 31 31 1 23 59 52 -28792 1969 12 31 31 1 23 59 52 -28792 1969 12 31 31 1 23 59 52 -28795 1969 12 31 31 1 23 59 55 -28795 1969 12 31 31 1 23 59 55 -28795 1969 12 31 31 1 23 59 55 -28798 1969 12 31 31 1 23 59 58 -28798 1969 12 31 31 1 23 59 58 -28800 1970 1 1 1 1 0 0 0 -28800 1970 1 1 1 1 0 0 0 -28802 1970 1 1 1 1 0 0 2 -28803 1970 1 1 1 1 0 0 3 -28804 1970 1 1 1 1 0 0 4 -28804 1970 1 1 1 1 0 0 4 -28805 1970 1 1 1 1 0 0 5 -28805 1970 1 1 1 1 0 0 5 -28806 1970 1 1 1 1 0 0 6 -28807 1970 1 1 1 1 0 0 7 -28807 1970 1 1 1 1 0 0 7 -28807 1970 1 1 1 1 0 0 7 -28808 1970 1 1 1 1 0 0 8 -28808 1970 1 1 1 1 0 0 8 -28809 1970 1 1 1 1 0 0 9 -28811 1970 1 1 1 1 0 0 11 -28813 1970 1 1 1 1 0 0 13 -28814 1970 1 1 1 1 0 0 14 -28815 1970 1 1 1 1 0 0 15 +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL PREHOOK: query: EXPLAIN SELECT to_unix_timestamp(stimestamp1) AS c1, year(stimestamp1), @@ -255,15 +257,15 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc_string - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: to_unix_timestamp(stimestamp1) (type: bigint), year(stimestamp1) (type: int), month(stimestamp1) (type: int), day(stimestamp1) (type: int), dayofmonth(stimestamp1) (type: int), weekofyear(stimestamp1) (type: int), hour(stimestamp1) (type: int), minute(stimestamp1) (type: int), second(stimestamp1) (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8 - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: bigint) sort order: + - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col7 (type: int), _col8 (type: int) Execution mode: vectorized Reducer 2 @@ -271,10 +273,10 @@ STAGE PLANS: Select Operator expressions: KEY.reducesinkkey0 (type: bigint), VALUE._col0 (type: int), VALUE._col1 (type: int), VALUE._col2 (type: int), VALUE._col3 (type: int), VALUE._col4 (type: int), VALUE._col5 (type: int), VALUE._col6 (type: int), VALUE._col7 (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8 - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -318,45 +320,45 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc_string #### A masked pattern was here #### NULL NULL NULL NULL NULL NULL NULL NULL NULL -28784 1969 12 31 31 1 23 59 44 -28784 1969 12 31 31 1 23 59 44 -28784 1969 12 31 31 1 23 59 44 -28784 1969 12 31 31 1 23 59 44 -28785 1969 12 31 31 1 23 59 45 -28786 1969 12 31 31 1 23 59 46 -28787 1969 12 31 31 1 23 59 47 -28788 1969 12 31 31 1 23 59 48 -28789 1969 12 31 31 1 23 59 49 -28789 1969 12 31 31 1 23 59 49 -28790 1969 12 31 31 1 23 59 50 -28792 1969 12 31 31 1 23 59 52 -28792 1969 12 31 31 1 23 59 52 -28792 1969 12 31 31 1 23 59 52 -28792 1969 12 31 31 1 23 59 52 -28795 1969 12 31 31 1 23 59 55 -28795 1969 12 31 31 1 23 59 55 -28795 1969 12 31 31 1 23 59 55 -28798 1969 12 31 31 1 23 59 58 -28798 1969 12 31 31 1 23 59 58 -28800 1970 1 1 1 1 0 0 0 -28800 1970 1 1 1 1 0 0 0 -28802 1970 1 1 1 1 0 0 2 -28803 1970 1 1 1 1 0 0 3 -28804 1970 1 1 1 1 0 0 4 -28804 1970 1 1 1 1 0 0 4 -28805 1970 1 1 1 1 0 0 5 -28805 1970 1 1 1 1 0 0 5 -28806 1970 1 1 1 1 0 0 6 -28807 1970 1 1 1 1 0 0 7 -28807 1970 1 1 1 1 0 0 7 -28807 1970 1 1 1 1 0 0 7 -28808 1970 1 1 1 1 0 0 8 -28808 1970 1 1 1 1 0 0 8 -28809 1970 1 1 1 1 0 0 9 -28811 1970 1 1 1 1 0 0 11 -28813 1970 1 1 1 1 0 0 13 -28814 1970 1 1 1 1 0 0 14 -28815 1970 1 1 1 1 0 0 15 +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL PREHOOK: query: EXPLAIN SELECT to_unix_timestamp(ctimestamp1) = to_unix_timestamp(stimestamp1) AS c1, year(ctimestamp1) = year(stimestamp1), @@ -398,15 +400,15 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc_string - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (to_unix_timestamp(ctimestamp1) = to_unix_timestamp(stimestamp1)) (type: boolean), (year(ctimestamp1) = year(stimestamp1)) (type: boolean), (month(ctimestamp1) = month(stimestamp1)) (type: boolean), (day(ctimestamp1) = day(stimestamp1)) (type: boolean), (dayofmonth(ctimestamp1) = dayofmonth(stimestamp1)) (type: boolean), (weekofyear(ctimestamp1) = weekofyear(stimestamp1)) (type: boolean), (hour(ctimestamp1) = hour(stimestamp1)) (type: boolean), (minute(ctimestamp1) = minute(stimestamp1)) (type: boolean), (second(ctimestamp1) = second(stimestamp1)) (type: boolean) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8 - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: boolean) sort order: + - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: boolean), _col2 (type: boolean), _col3 (type: boolean), _col4 (type: boolean), _col5 (type: boolean), _col6 (type: boolean), _col7 (type: boolean), _col8 (type: boolean) Execution mode: vectorized Reducer 2 @@ -414,10 +416,10 @@ STAGE PLANS: Select Operator expressions: KEY.reducesinkkey0 (type: boolean), VALUE._col0 (type: boolean), VALUE._col1 (type: boolean), VALUE._col2 (type: boolean), VALUE._col3 (type: boolean), VALUE._col4 (type: boolean), VALUE._col5 (type: boolean), VALUE._col6 (type: boolean), VALUE._col7 (type: boolean) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8 - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -463,45 +465,45 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc_string #### A masked pattern was here #### NULL NULL NULL NULL NULL NULL NULL NULL NULL -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL PREHOOK: query: -- Wrong format. Should all be NULL. EXPLAIN SELECT to_unix_timestamp(stimestamp1) AS c1, @@ -639,11 +641,11 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc_string - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctimestamp1 (type: timestamp) outputColumnNames: ctimestamp1 - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: min(ctimestamp1), max(ctimestamp1), count(ctimestamp1), count() mode: hash @@ -694,7 +696,7 @@ FROM alltypesorc_string POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc_string #### A masked pattern was here #### -1969-12-31 23:59:44.088 1970-01-01 00:00:15.007 39 40 +NULL NULL 0 40 PREHOOK: query: -- SUM of timestamps are not vectorized reduce-side because they produce a double instead of a long (HIVE-8211)... EXPLAIN SELECT sum(ctimestamp1) @@ -720,11 +722,11 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc_string - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctimestamp1 (type: timestamp) outputColumnNames: ctimestamp1 - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: sum(ctimestamp1) mode: hash @@ -768,7 +770,7 @@ FROM alltypesorc_string POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc_string #### A masked pattern was here #### -1123143.857 +NULL PREHOOK: query: EXPLAIN SELECT avg(ctimestamp1), variance(ctimestamp1), @@ -806,11 +808,11 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc_string - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctimestamp1 (type: timestamp) outputColumnNames: ctimestamp1 - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: avg(ctimestamp1), variance(ctimestamp1), var_pop(ctimestamp1), var_samp(ctimestamp1), std(ctimestamp1), stddev(ctimestamp1), stddev_pop(ctimestamp1), stddev_samp(ctimestamp1) mode: hash @@ -868,4 +870,4 @@ FROM alltypesorc_string POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc_string #### A masked pattern was here #### -2.8798560435897438E13 8.970772952794215E19 8.970772952794215E19 9.206845925236167E19 9.471416447815086E9 9.471416447815086E9 9.471416447815086E9 9.595231068211004E9 +NULL NULL NULL NULL NULL NULL NULL NULL diff --git a/ql/src/test/results/clientpositive/subquery_exists.q.out b/ql/src/test/results/clientpositive/subquery_exists.q.out index da18d2f..4b270e1 100644 --- a/ql/src/test/results/clientpositive/subquery_exists.q.out +++ b/ql/src/test/results/clientpositive/subquery_exists.q.out @@ -1,6 +1,7 @@ PREHOOK: query: -- SORT_QUERY_RESULTS -- no agg, corr +-- SORT_QUERY_RESULTS explain select * from src b @@ -13,6 +14,7 @@ PREHOOK: type: QUERY POSTHOOK: query: -- SORT_QUERY_RESULTS -- no agg, corr +-- SORT_QUERY_RESULTS explain select * from src b @@ -88,7 +90,8 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select * +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from src b where exists (select a.key @@ -98,7 +101,8 @@ where exists PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: select * +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from src b where exists (select a.key @@ -120,6 +124,7 @@ POSTHOOK: Input: default@src 98 val_98 98 val_98 PREHOOK: query: -- view test +-- SORT_QUERY_RESULTS create view cv1 as select * from src b @@ -132,6 +137,7 @@ PREHOOK: Input: default@src PREHOOK: Output: database:default PREHOOK: Output: default@cv1 POSTHOOK: query: -- view test +-- SORT_QUERY_RESULTS create view cv1 as select * from src b @@ -143,12 +149,14 @@ POSTHOOK: type: CREATEVIEW POSTHOOK: Input: default@src POSTHOOK: Output: database:default POSTHOOK: Output: default@cv1 -PREHOOK: query: select * from cv1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from cv1 PREHOOK: type: QUERY PREHOOK: Input: default@cv1 PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: select * from cv1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from cv1 POSTHOOK: type: QUERY POSTHOOK: Input: default@cv1 POSTHOOK: Input: default@src @@ -165,6 +173,7 @@ POSTHOOK: Input: default@src 98 val_98 98 val_98 PREHOOK: query: -- sq in from +-- SORT_QUERY_RESULTS select * from (select * from src b @@ -177,6 +186,7 @@ PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### POSTHOOK: query: -- sq in from +-- SORT_QUERY_RESULTS select * from (select * from src b diff --git a/ql/src/test/results/clientpositive/temp_table.q.out b/ql/src/test/results/clientpositive/temp_table.q.out index cad71fd..2c5730d 100644 --- a/ql/src/test/results/clientpositive/temp_table.q.out +++ b/ql/src/test/results/clientpositive/temp_table.q.out @@ -228,48 +228,70 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@bar key string value string -PREHOOK: query: explain select * from foo limit 10 +PREHOOK: query: explain select * from foo order by key limit 10 PREHOOK: type: QUERY -POSTHOOK: query: explain select * from foo limit 10 +POSTHOOK: query: explain select * from foo order by key limit 10 POSTHOOK: type: QUERY STAGE DEPENDENCIES: - Stage-0 is a root stage + Stage-1 is a root stage + Stage-0 depends on stages: Stage-1 STAGE PLANS: + Stage: Stage-1 + Map Reduce + Map Operator Tree: + TableScan + alias: foo + Statistics: Num rows: 247 Data size: 2609 Basic stats: COMPLETE Column stats: NONE + Select Operator + expressions: key (type: string), value (type: string) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 247 Data size: 2609 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col0 (type: string) + sort order: + + Statistics: Num rows: 247 Data size: 2609 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: string) + Reduce Operator Tree: + Select Operator + expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 247 Data size: 2609 Basic stats: COMPLETE Column stats: NONE + Limit + Number of rows: 10 + Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE Column stats: NONE + File Output Operator + compressed: false + Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE Column stats: NONE + table: + input format: org.apache.hadoop.mapred.TextInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + Stage: Stage-0 Fetch Operator limit: 10 Processor Tree: - TableScan - alias: foo - Statistics: Num rows: 247 Data size: 2609 Basic stats: COMPLETE Column stats: NONE - Select Operator - expressions: key (type: string), value (type: string) - outputColumnNames: _col0, _col1 - Statistics: Num rows: 247 Data size: 2609 Basic stats: COMPLETE Column stats: NONE - Limit - Number of rows: 10 - Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE Column stats: NONE - ListSink + ListSink -PREHOOK: query: select * from foo limit 10 +PREHOOK: query: select * from foo order by key limit 10 PREHOOK: type: QUERY PREHOOK: Input: default@foo #### A masked pattern was here #### -POSTHOOK: query: select * from foo limit 10 +POSTHOOK: query: select * from foo order by key limit 10 POSTHOOK: type: QUERY POSTHOOK: Input: default@foo #### A masked pattern was here #### -238 val_238 -86 val_86 -278 val_278 -98 val_98 -484 val_484 -150 val_150 -224 val_224 -66 val_66 -128 val_128 -146 val_146 +0 val_0 +0 val_0 +0 val_0 +10 val_10 +100 val_100 +100 val_100 +104 val_104 +104 val_104 +114 val_114 +116 val_116 PREHOOK: query: explain select * from (select * from foo union all select * from bar) u order by key limit 10 PREHOOK: type: QUERY POSTHOOK: query: explain select * from (select * from foo union all select * from bar) u order by key limit 10 @@ -396,11 +418,11 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@bay POSTHOOK: Lineage: bay.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: bay.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: select * from bay limit 10 +PREHOOK: query: select * from bay order by key limit 10 PREHOOK: type: QUERY PREHOOK: Input: default@bay #### A masked pattern was here #### -POSTHOOK: query: select * from bay limit 10 +POSTHOOK: query: select * from bay order by key limit 10 POSTHOOK: type: QUERY POSTHOOK: Input: default@bay #### A masked pattern was here #### 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 diff --git a/ql/src/test/results/clientpositive/tez/auto_join0.q.out b/ql/src/test/results/clientpositive/tez/auto_join0.q.out index cea6f99..f9383e6 100644 --- a/ql/src/test/results/clientpositive/tez/auto_join0.q.out +++ b/ql/src/test/results/clientpositive/tez/auto_join0.q.out @@ -1,23 +1,25 @@ -Warning: Map Join MAPJOIN[20][bigTable=?] in task 'Map 1' is a cross product -PREHOOK: query: explain +Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Reducer 2' is a cross product +PREHOOK: query: -- SORT_QUERY_RESULTS +explain 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 PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain 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 POSTHOOK: type: QUERY @@ -29,9 +31,10 @@ STAGE PLANS: Stage: Stage-1 Tez Edges: - Map 1 <- Map 4 (BROADCAST_EDGE) - Reducer 2 <- Map 1 (SIMPLE_EDGE) + Reducer 2 <- Map 1 (SIMPLE_EDGE), Reducer 6 (BROADCAST_EDGE) Reducer 3 <- Reducer 2 (SIMPLE_EDGE) + Reducer 4 <- Reducer 3 (SIMPLE_EDGE) + Reducer 6 <- Map 5 (SIMPLE_EDGE) #### A masked pattern was here #### Vertices: Map 1 @@ -46,22 +49,11 @@ STAGE PLANS: expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE - Map Join Operator - condition map: - Inner Join 0 to 1 - keys: - 0 - 1 - outputColumnNames: _col0, _col1, _col2, _col3 - input vertices: - 1 Map 4 - Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE - HybridGraceHashJoin: true - Reduce Output Operator - key expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string) - sort order: ++++ - Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE - Map 4 + Reduce Output Operator + key expressions: _col0 (type: string), _col1 (type: string) + sort order: ++ + Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE + Map 5 Map Operator Tree: TableScan alias: src @@ -74,12 +66,33 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator - sort order: + key expressions: _col0 (type: string), _col1 (type: string) + sort order: ++ Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: string), _col1 (type: string) Reducer 2 Reduce Operator Tree: Select Operator + expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE + Map Join Operator + condition map: + Inner Join 0 to 1 + keys: + 0 + 1 + outputColumnNames: _col0, _col1, _col2, _col3 + input vertices: + 1 Reducer 6 + Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE + HybridGraceHashJoin: true + Reduce Output Operator + key expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string), _col3 (type: string) + sort order: ++++ + Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE + Reducer 3 + Reduce Operator Tree: + Select Operator expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string), KEY.reducesinkkey2 (type: string), KEY.reducesinkkey3 (type: string) outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 182 Data size: 1939 Basic stats: COMPLETE Column stats: NONE @@ -92,7 +105,7 @@ STAGE PLANS: sort order: Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE value expressions: _col0 (type: bigint) - Reducer 3 + Reducer 4 Reduce Operator Tree: Group By Operator aggregations: sum(VALUE._col0) @@ -106,6 +119,16 @@ STAGE PLANS: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + Reducer 6 + Reduce Operator Tree: + Select Operator + expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 (type: string) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + sort order: + Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE + value expressions: _col0 (type: string), _col1 (type: string) Stage: Stage-0 Fetch Operator @@ -113,26 +136,28 @@ STAGE PLANS: Processor Tree: ListSink -Warning: Map Join MAPJOIN[20][bigTable=?] in task 'Map 1' is a cross product -PREHOOK: query: select sum(hash(a.k1,a.v1,a.k2, a.v2)) +Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Reducer 2' is a cross product +PREHOOK: query: -- SORT_QUERY_RESULTS +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 PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: select sum(hash(a.k1,a.v1,a.k2, a.v2)) +POSTHOOK: query: -- SORT_QUERY_RESULTS +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 POSTHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/tez/auto_join1.q.out b/ql/src/test/results/clientpositive/tez/auto_join1.q.out index 078d504..efc5e81 100644 --- a/ql/src/test/results/clientpositive/tez/auto_join1.q.out +++ b/ql/src/test/results/clientpositive/tez/auto_join1.q.out @@ -6,12 +6,14 @@ POSTHOOK: query: CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 -PREHOOK: query: explain -FROM src src1 JOIN src src2 ON (src1.key = src2.key) +PREHOOK: query: -- SORT_QUERY_RESULTS +explain +FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value PREHOOK: type: QUERY -POSTHOOK: query: explain -FROM src src1 JOIN src src2 ON (src1.key = src2.key) +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain +FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -96,12 +98,14 @@ STAGE PLANS: Stage: Stage-3 Stats-Aggr Operator -PREHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key) +PREHOOK: query: -- SORT_QUERY_RESULTS +FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@dest_j1 -POSTHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key) +POSTHOOK: query: -- SORT_QUERY_RESULTS +FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src diff --git a/ql/src/test/results/clientpositive/tez/auto_join29.q.out b/ql/src/test/results/clientpositive/tez/auto_join29.q.out index 2cab06e..bbff852 100644 --- a/ql/src/test/results/clientpositive/tez/auto_join29.q.out +++ b/ql/src/test/results/clientpositive/tez/auto_join29.q.out @@ -100,11 +100,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -608,10 +610,12 @@ NULL NULL NULL NULL 97 val_97 NULL NULL NULL NULL 97 val_97 NULL NULL NULL NULL 98 val_98 NULL NULL NULL NULL 98 val_98 -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -709,11 +713,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -1217,10 +1223,12 @@ POSTHOOK: Input: default@src 97 val_97 NULL NULL NULL NULL 98 val_98 NULL NULL NULL NULL 98 val_98 NULL NULL NULL NULL -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -1318,11 +1326,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -1838,10 +1848,12 @@ NULL NULL 97 val_97 NULL NULL NULL NULL 97 val_97 NULL NULL NULL NULL 98 val_98 NULL NULL NULL NULL 98 val_98 NULL NULL -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -1936,11 +1948,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -2456,10 +2470,12 @@ NULL NULL NULL NULL 97 val_97 NULL NULL NULL NULL 97 val_97 NULL NULL NULL NULL 98 val_98 NULL NULL NULL NULL 98 val_98 -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -2556,18 +2572,22 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) LEFT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -2665,18 +2685,22 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) RIGHT OUTER JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -2770,18 +2794,22 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 LEFT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -2878,11 +2906,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 RIGHT OUTER JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### @@ -2908,10 +2938,12 @@ NULL NULL 5 val_5 5 val_5 NULL NULL 5 val_5 5 val_5 NULL NULL 8 val_8 8 val_8 NULL NULL 9 val_9 9 val_9 -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -3004,11 +3036,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT * FROM src src1 JOIN src src2 ON (src1.key = src2.key AND src1.key < 10 AND src2.key > 10) JOIN src src3 ON (src2.key = src3.key AND src3.key < 10) SORT BY src1.key, src1.value, src2.key, src2.value, src3.key, src3.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/tez/cbo_gby.q.out b/ql/src/test/results/clientpositive/tez/cbo_gby.q.out index 3dc8914..c4e848d 100644 --- a/ql/src/test/results/clientpositive/tez/cbo_gby.q.out +++ b/ql/src/test/results/clientpositive/tez/cbo_gby.q.out @@ -1,34 +1,39 @@ PREHOOK: query: -- 6. Test Select + TS + Join + Fil + GB + GB Having +-- SORT_QUERY_RESULTS select key, (c_int+1)+2 as x, sum(c_int) from cbo_t1 group by c_float, cbo_t1.c_int, key PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### POSTHOOK: query: -- 6. Test Select + TS + Join + Fil + GB + GB Having +-- SORT_QUERY_RESULTS select key, (c_int+1)+2 as x, sum(c_int) from cbo_t1 group by c_float, cbo_t1.c_int, key POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -NULL NULL NULL 1 4 2 1 4 2 1 4 12 1 4 2 -PREHOOK: query: select x, y, count(*) from (select key, (c_int+c_float+1+2) as x, sum(c_int) as y from cbo_t1 group by c_float, cbo_t1.c_int, key) R group by y, x +NULL NULL NULL +PREHOOK: query: --SORT_QUERY_RESULTS +select x, y, count(*) from (select key, (c_int+c_float+1+2) as x, sum(c_int) as y from cbo_t1 group by c_float, cbo_t1.c_int, key) R group by y, x PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -POSTHOOK: query: select x, y, count(*) from (select key, (c_int+c_float+1+2) as x, sum(c_int) as y from cbo_t1 group by c_float, cbo_t1.c_int, key) R group by y, x +POSTHOOK: query: --SORT_QUERY_RESULTS +select x, y, count(*) from (select key, (c_int+c_float+1+2) as x, sum(c_int) as y from cbo_t1 group by c_float, cbo_t1.c_int, key) R group by y, x POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -NULL NULL 1 -5.0 2 3 5.0 12 1 -PREHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key order by a) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key order by q/10 desc, r asc) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c order by cbo_t3.c_int+c desc, c +5.0 2 3 +NULL NULL 1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key order by a) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key order by q/10 desc, r asc) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c order by cbo_t3.c_int+c desc, c PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 @@ -36,7 +41,8 @@ PREHOOK: Input: default@cbo_t2 PREHOOK: Input: default@cbo_t2@dt=2014 PREHOOK: Input: default@cbo_t3 #### A masked pattern was here #### -POSTHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key order by a) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key order by q/10 desc, r asc) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c order by cbo_t3.c_int+c desc, c +POSTHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key order by a) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key order by q/10 desc, r asc) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c order by cbo_t3.c_int+c desc, c POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 @@ -46,7 +52,8 @@ POSTHOOK: Input: default@cbo_t3 #### A masked pattern was here #### 1 12 6 1 2 6 -PREHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b % c asc, b desc) cbo_t1 left outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p left outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int % c asc, cbo_t3.c_int desc +PREHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b % c asc, b desc) cbo_t1 left outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p left outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int % c asc, cbo_t3.c_int desc PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 @@ -54,7 +61,8 @@ PREHOOK: Input: default@cbo_t2 PREHOOK: Input: default@cbo_t2@dt=2014 PREHOOK: Input: default@cbo_t3 #### A masked pattern was here #### -POSTHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b % c asc, b desc) cbo_t1 left outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p left outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int % c asc, cbo_t3.c_int desc +POSTHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b % c asc, b desc) cbo_t1 left outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p left outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int % c asc, cbo_t3.c_int desc POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 @@ -64,7 +72,8 @@ POSTHOOK: Input: default@cbo_t3 #### A masked pattern was here #### 1 12 6 1 2 6 -PREHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b+c, a desc) cbo_t1 right outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p right outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 2) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c +PREHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b+c, a desc) cbo_t1 right outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p right outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 2) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 @@ -72,7 +81,8 @@ PREHOOK: Input: default@cbo_t2 PREHOOK: Input: default@cbo_t2@dt=2014 PREHOOK: Input: default@cbo_t3 #### A masked pattern was here #### -POSTHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b+c, a desc) cbo_t1 right outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p right outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 2) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c +POSTHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b+c, a desc) cbo_t1 right outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p right outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 2) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 @@ -80,9 +90,10 @@ POSTHOOK: Input: default@cbo_t2 POSTHOOK: Input: default@cbo_t2@dt=2014 POSTHOOK: Input: default@cbo_t3 #### A masked pattern was here #### -1 2 6 1 12 6 -PREHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by c+a desc) cbo_t1 full outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by p+q desc, r asc) cbo_t2 on cbo_t1.a=p full outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int +1 2 6 +PREHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by c+a desc) cbo_t1 full outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by p+q desc, r asc) cbo_t2 on cbo_t1.a=p full outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 @@ -90,7 +101,8 @@ PREHOOK: Input: default@cbo_t2 PREHOOK: Input: default@cbo_t2@dt=2014 PREHOOK: Input: default@cbo_t3 #### A masked pattern was here #### -POSTHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by c+a desc) cbo_t1 full outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by p+q desc, r asc) cbo_t2 on cbo_t1.a=p full outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int +POSTHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by c+a desc) cbo_t1 full outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by p+q desc, r asc) cbo_t2 on cbo_t1.a=p full outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 @@ -100,7 +112,8 @@ POSTHOOK: Input: default@cbo_t3 #### A masked pattern was here #### 1 12 6 1 2 6 -PREHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c +PREHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 @@ -108,7 +121,8 @@ PREHOOK: Input: default@cbo_t2 PREHOOK: Input: default@cbo_t2@dt=2014 PREHOOK: Input: default@cbo_t3 #### A masked pattern was here #### -POSTHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c +POSTHOOK: query: -- SORT_QUERY_RESULTS +select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 @@ -116,5 +130,5 @@ POSTHOOK: Input: default@cbo_t2 POSTHOOK: Input: default@cbo_t2@dt=2014 POSTHOOK: Input: default@cbo_t3 #### A masked pattern was here #### -1 2 6 1 12 6 +1 2 6 diff --git a/ql/src/test/results/clientpositive/tez/cbo_udf_udaf.q.out b/ql/src/test/results/clientpositive/tez/cbo_udf_udaf.q.out index ded043f..ac362d1 100644 --- a/ql/src/test/results/clientpositive/tez/cbo_udf_udaf.q.out +++ b/ql/src/test/results/clientpositive/tez/cbo_udf_udaf.q.out @@ -21,8 +21,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -2 0 NULL NULL NULL NULL 3 6 18 18 18 1.0 1 1 2 36 +2 0 NULL NULL NULL NULL 3 6 PREHOOK: query: select * from (select count(*) as a, count(distinct c_int) as b, sum(c_int) as c, avg(c_int) as d, max(c_int) as e, min(c_int) as f from cbo_t1) cbo_t1 PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 @@ -44,8 +44,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -2 0 NULL NULL NULL NULL 3 6 18 1 18 1.0 1 1 2 36 +2 0 NULL NULL NULL NULL 3 6 PREHOOK: query: select f,a,e,b from (select count(*) as a, count(c_int) as b, sum(c_int) as c, avg(c_int) as d, max(c_int) as e, min(c_int) as f from cbo_t1) cbo_t1 PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 @@ -68,21 +68,23 @@ POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### 1 20 1 1 -PREHOOK: query: select key,count(c_int) as a, avg(c_float) from cbo_t1 group by key order by a +PREHOOK: query: -- SORT_QUERY_RESULTS +select key,count(c_int) as a, avg(c_float) from cbo_t1 group by key order by a PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -POSTHOOK: query: select key,count(c_int) as a, avg(c_float) from cbo_t1 group by key order by a +POSTHOOK: query: -- SORT_QUERY_RESULTS +select key,count(c_int) as a, avg(c_float) from cbo_t1 group by key order by a POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -NULL 0 NULL -1 2 1.0 - 1 2 1.0 1 2 1.0 + 1 2 1.0 1 12 1.0 +1 2 1.0 +NULL 0 NULL PREHOOK: query: select count(distinct c_int) as a, avg(c_float) from cbo_t1 group by c_float order by a PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 diff --git a/ql/src/test/results/clientpositive/tez/cbo_windowing.q.out b/ql/src/test/results/clientpositive/tez/cbo_windowing.q.out index 1a274b0..c05ad20 100644 --- a/ql/src/test/results/clientpositive/tez/cbo_windowing.q.out +++ b/ql/src/test/results/clientpositive/tez/cbo_windowing.q.out @@ -1,10 +1,12 @@ PREHOOK: query: -- 9. Test Windowing Functions +-- SORT_QUERY_RESULTS select count(c_int) over() from cbo_t1 PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### POSTHOOK: query: -- 9. Test Windowing Functions +-- SORT_QUERY_RESULTS select count(c_int) over() from cbo_t1 POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 @@ -30,25 +32,19 @@ POSTHOOK: Input: default@cbo_t1@dt=2014 18 18 18 -PREHOOK: query: select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1 PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -POSTHOOK: query: select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1 POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### 18 18.0 1 1 1 1 1 0.0 1 NULL -18 18.0 1 1 2 1 1 0.0 1 NULL -18 18.0 1 1 3 1 1 0.0 1 NULL -18 18.0 1 1 4 1 1 0.0 1 NULL -18 18.0 1 1 5 1 1 0.0 1 1.0 -18 18.0 1 1 6 1 1 0.0 1 1.0 -18 18.0 1 1 7 1 1 0.0 1 1.0 -18 18.0 1 1 8 1 1 0.0 1 1.0 -18 18.0 1 1 9 1 1 0.0 1 1.0 18 18.0 1 1 10 1 1 0.0 1 1.0 18 18.0 1 1 11 1 1 0.0 1 1.0 18 18.0 1 1 12 1 1 0.0 1 1.0 @@ -59,26 +55,28 @@ POSTHOOK: Input: default@cbo_t1@dt=2014 18 18.0 1 1 17 1 1 0.0 1 1.0 18 18.0 1 1 18 1 1 0.0 1 1.0 18 18.0 1 1 19 1 1 0.0 1 1.0 +18 18.0 1 1 2 1 1 0.0 1 NULL 18 18.0 1 1 20 1 1 0.0 1 1.0 -PREHOOK: query: select * from (select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1) cbo_t1 +18 18.0 1 1 3 1 1 0.0 1 NULL +18 18.0 1 1 4 1 1 0.0 1 NULL +18 18.0 1 1 5 1 1 0.0 1 1.0 +18 18.0 1 1 6 1 1 0.0 1 1.0 +18 18.0 1 1 7 1 1 0.0 1 1.0 +18 18.0 1 1 8 1 1 0.0 1 1.0 +18 18.0 1 1 9 1 1 0.0 1 1.0 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from (select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1) cbo_t1 PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -POSTHOOK: query: select * from (select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1) cbo_t1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from (select count(c_int) over(), sum(c_float) over(), max(c_int) over(), min(c_int) over(), row_number() over(), rank() over(), dense_rank() over(), percent_rank() over(), lead(c_int, 2, c_int) over(), lag(c_float, 2, c_float) over() from cbo_t1) cbo_t1 POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### 18 18.0 1 1 1 1 1 0.0 1 NULL -18 18.0 1 1 2 1 1 0.0 1 NULL -18 18.0 1 1 3 1 1 0.0 1 NULL -18 18.0 1 1 4 1 1 0.0 1 NULL -18 18.0 1 1 5 1 1 0.0 1 1.0 -18 18.0 1 1 6 1 1 0.0 1 1.0 -18 18.0 1 1 7 1 1 0.0 1 1.0 -18 18.0 1 1 8 1 1 0.0 1 1.0 -18 18.0 1 1 9 1 1 0.0 1 1.0 18 18.0 1 1 10 1 1 0.0 1 1.0 18 18.0 1 1 11 1 1 0.0 1 1.0 18 18.0 1 1 12 1 1 0.0 1 1.0 @@ -89,13 +87,23 @@ POSTHOOK: Input: default@cbo_t1@dt=2014 18 18.0 1 1 17 1 1 0.0 1 1.0 18 18.0 1 1 18 1 1 0.0 1 1.0 18 18.0 1 1 19 1 1 0.0 1 1.0 +18 18.0 1 1 2 1 1 0.0 1 NULL 18 18.0 1 1 20 1 1 0.0 1 1.0 -PREHOOK: query: select x from (select count(c_int) over() as x, sum(c_float) over() from cbo_t1) cbo_t1 +18 18.0 1 1 3 1 1 0.0 1 NULL +18 18.0 1 1 4 1 1 0.0 1 NULL +18 18.0 1 1 5 1 1 0.0 1 1.0 +18 18.0 1 1 6 1 1 0.0 1 1.0 +18 18.0 1 1 7 1 1 0.0 1 1.0 +18 18.0 1 1 8 1 1 0.0 1 1.0 +18 18.0 1 1 9 1 1 0.0 1 1.0 +PREHOOK: query: -- SORT_QUERY_RESULTS +select x from (select count(c_int) over() as x, sum(c_float) over() from cbo_t1) cbo_t1 PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -POSTHOOK: query: select x from (select count(c_int) over() as x, sum(c_float) over() from cbo_t1) cbo_t1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select x from (select count(c_int) over() as x, sum(c_float) over() from cbo_t1) cbo_t1 POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 @@ -120,12 +128,14 @@ POSTHOOK: Input: default@cbo_t1@dt=2014 18 18 18 -PREHOOK: query: select 1+sum(c_int) over() from cbo_t1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select 1+sum(c_int) over() from cbo_t1 PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -POSTHOOK: query: select 1+sum(c_int) over() from cbo_t1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select 1+sum(c_int) over() from cbo_t1 POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 @@ -150,34 +160,41 @@ POSTHOOK: Input: default@cbo_t1@dt=2014 19 19 19 -PREHOOK: query: select sum(c_int)+sum(sum(c_int)) over() from cbo_t1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select sum(c_int)+sum(sum(c_int)) over() from cbo_t1 PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -POSTHOOK: query: select sum(c_int)+sum(sum(c_int)) over() from cbo_t1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select sum(c_int)+sum(sum(c_int)) over() from cbo_t1 POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### 36 -PREHOOK: query: select * from (select max(c_int) over (partition by key order by value Rows UNBOUNDED PRECEDING), min(c_int) over (partition by key order by value rows current row), count(c_int) over(partition by key order by value ROWS 1 PRECEDING), avg(value) over (partition by key order by value Rows between unbounded preceding and unbounded following), sum(value) over (partition by key order by value rows between unbounded preceding and current row), avg(c_float) over (partition by key order by value Rows between 1 preceding and unbounded following), sum(c_float) over (partition by key order by value rows between 1 preceding and current row), max(c_float) over (partition by key order by value rows between 1 preceding and unbounded following), min(c_float) over (partition by key order by value rows between 1 preceding and 1 following) from cbo_t1) cbo_t1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from (select max(c_int) over (partition by key order by value Rows UNBOUNDED PRECEDING), min(c_int) over (partition by key order by value rows current row), count(c_int) over(partition by key order by value ROWS 1 PRECEDING), avg(value) over (partition by key order by value Rows between unbounded preceding and unbounded following), sum(value) over (partition by key order by value rows between unbounded preceding and current row), avg(c_float) over (partition by key order by value Rows between 1 preceding and unbounded following), sum(c_float) over (partition by key order by value rows between 1 preceding and current row), max(c_float) over (partition by key order by value rows between 1 preceding and unbounded following), min(c_float) over (partition by key order by value rows between 1 preceding and 1 following) from cbo_t1) cbo_t1 PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -POSTHOOK: query: select * from (select max(c_int) over (partition by key order by value Rows UNBOUNDED PRECEDING), min(c_int) over (partition by key order by value rows current row), count(c_int) over(partition by key order by value ROWS 1 PRECEDING), avg(value) over (partition by key order by value Rows between unbounded preceding and unbounded following), sum(value) over (partition by key order by value rows between unbounded preceding and current row), avg(c_float) over (partition by key order by value Rows between 1 preceding and unbounded following), sum(c_float) over (partition by key order by value rows between 1 preceding and current row), max(c_float) over (partition by key order by value rows between 1 preceding and unbounded following), min(c_float) over (partition by key order by value rows between 1 preceding and 1 following) from cbo_t1) cbo_t1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from (select max(c_int) over (partition by key order by value Rows UNBOUNDED PRECEDING), min(c_int) over (partition by key order by value rows current row), count(c_int) over(partition by key order by value ROWS 1 PRECEDING), avg(value) over (partition by key order by value Rows between unbounded preceding and unbounded following), sum(value) over (partition by key order by value rows between unbounded preceding and current row), avg(c_float) over (partition by key order by value Rows between 1 preceding and unbounded following), sum(c_float) over (partition by key order by value rows between 1 preceding and current row), max(c_float) over (partition by key order by value rows between 1 preceding and unbounded following), min(c_float) over (partition by key order by value rows between 1 preceding and 1 following) from cbo_t1) cbo_t1 POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -NULL NULL 0 NULL NULL NULL NULL NULL NULL -NULL NULL 0 NULL NULL NULL NULL NULL NULL 1 1 1 1.0 1.0 1.0 1.0 1.0 1.0 -1 1 2 1.0 2.0 1.0 2.0 1.0 1.0 1 1 1 1.0 1.0 1.0 1.0 1.0 1.0 -1 1 2 1.0 2.0 1.0 2.0 1.0 1.0 1 1 1 1.0 1.0 1.0 1.0 1.0 1.0 +1 1 1 1.0 1.0 1.0 1.0 1.0 1.0 +1 1 2 1.0 10.0 1.0 2.0 1.0 1.0 +1 1 2 1.0 11.0 1.0 2.0 1.0 1.0 +1 1 2 1.0 12.0 1.0 2.0 1.0 1.0 +1 1 2 1.0 2.0 1.0 2.0 1.0 1.0 +1 1 2 1.0 2.0 1.0 2.0 1.0 1.0 +1 1 2 1.0 2.0 1.0 2.0 1.0 1.0 1 1 2 1.0 2.0 1.0 2.0 1.0 1.0 1 1 2 1.0 3.0 1.0 2.0 1.0 1.0 1 1 2 1.0 4.0 1.0 2.0 1.0 1.0 @@ -186,27 +203,20 @@ NULL NULL 0 NULL NULL NULL NULL NULL NULL 1 1 2 1.0 7.0 1.0 2.0 1.0 1.0 1 1 2 1.0 8.0 1.0 2.0 1.0 1.0 1 1 2 1.0 9.0 1.0 2.0 1.0 1.0 -1 1 2 1.0 10.0 1.0 2.0 1.0 1.0 -1 1 2 1.0 11.0 1.0 2.0 1.0 1.0 -1 1 2 1.0 12.0 1.0 2.0 1.0 1.0 -1 1 1 1.0 1.0 1.0 1.0 1.0 1.0 -1 1 2 1.0 2.0 1.0 2.0 1.0 1.0 -PREHOOK: query: select i, a, h, b, c, d, e, f, g, a as x, a +1 as y from (select max(c_int) over (partition by key order by value range UNBOUNDED PRECEDING) a, min(c_int) over (partition by key order by value range current row) b, count(c_int) over(partition by key order by value range 1 PRECEDING) c, avg(value) over (partition by key order by value range between unbounded preceding and unbounded following) d, sum(value) over (partition by key order by value range between unbounded preceding and current row) e, avg(c_float) over (partition by key order by value range between 1 preceding and unbounded following) f, sum(c_float) over (partition by key order by value range between 1 preceding and current row) g, max(c_float) over (partition by key order by value range between 1 preceding and unbounded following) h, min(c_float) over (partition by key order by value range between 1 preceding and 1 following) i from cbo_t1) cbo_t1 +NULL NULL 0 NULL NULL NULL NULL NULL NULL +NULL NULL 0 NULL NULL NULL NULL NULL NULL +PREHOOK: query: -- SORT_QUERY_RESULTS +select i, a, h, b, c, d, e, f, g, a as x, a +1 as y from (select max(c_int) over (partition by key order by value range UNBOUNDED PRECEDING) a, min(c_int) over (partition by key order by value range current row) b, count(c_int) over(partition by key order by value range 1 PRECEDING) c, avg(value) over (partition by key order by value range between unbounded preceding and unbounded following) d, sum(value) over (partition by key order by value range between unbounded preceding and current row) e, avg(c_float) over (partition by key order by value range between 1 preceding and unbounded following) f, sum(c_float) over (partition by key order by value range between 1 preceding and current row) g, max(c_float) over (partition by key order by value range between 1 preceding and unbounded following) h, min(c_float) over (partition by key order by value range between 1 preceding and 1 following) i from cbo_t1) cbo_t1 PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 PREHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -POSTHOOK: query: select i, a, h, b, c, d, e, f, g, a as x, a +1 as y from (select max(c_int) over (partition by key order by value range UNBOUNDED PRECEDING) a, min(c_int) over (partition by key order by value range current row) b, count(c_int) over(partition by key order by value range 1 PRECEDING) c, avg(value) over (partition by key order by value range between unbounded preceding and unbounded following) d, sum(value) over (partition by key order by value range between unbounded preceding and current row) e, avg(c_float) over (partition by key order by value range between 1 preceding and unbounded following) f, sum(c_float) over (partition by key order by value range between 1 preceding and current row) g, max(c_float) over (partition by key order by value range between 1 preceding and unbounded following) h, min(c_float) over (partition by key order by value range between 1 preceding and 1 following) i from cbo_t1) cbo_t1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select i, a, h, b, c, d, e, f, g, a as x, a +1 as y from (select max(c_int) over (partition by key order by value range UNBOUNDED PRECEDING) a, min(c_int) over (partition by key order by value range current row) b, count(c_int) over(partition by key order by value range 1 PRECEDING) c, avg(value) over (partition by key order by value range between unbounded preceding and unbounded following) d, sum(value) over (partition by key order by value range between unbounded preceding and current row) e, avg(c_float) over (partition by key order by value range between 1 preceding and unbounded following) f, sum(c_float) over (partition by key order by value range between 1 preceding and current row) g, max(c_float) over (partition by key order by value range between 1 preceding and unbounded following) h, min(c_float) over (partition by key order by value range between 1 preceding and 1 following) i from cbo_t1) cbo_t1 POSTHOOK: type: QUERY POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 #### A masked pattern was here #### -NULL NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL -NULL NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL -1.0 1 1.0 1 2 1.0 2.0 1.0 2.0 1 2 -1.0 1 1.0 1 2 1.0 2.0 1.0 2.0 1 2 -1.0 1 1.0 1 2 1.0 2.0 1.0 2.0 1 2 -1.0 1 1.0 1 2 1.0 2.0 1.0 2.0 1 2 1.0 1 1.0 1 12 1.0 12.0 1.0 12.0 1 2 1.0 1 1.0 1 12 1.0 12.0 1.0 12.0 1 2 1.0 1 1.0 1 12 1.0 12.0 1.0 12.0 1 2 @@ -221,11 +231,19 @@ NULL NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL 1.0 1 1.0 1 12 1.0 12.0 1.0 12.0 1 2 1.0 1 1.0 1 2 1.0 2.0 1.0 2.0 1 2 1.0 1 1.0 1 2 1.0 2.0 1.0 2.0 1 2 -PREHOOK: query: select *, rank() over(partition by key order by value) as rr from src1 +1.0 1 1.0 1 2 1.0 2.0 1.0 2.0 1 2 +1.0 1 1.0 1 2 1.0 2.0 1.0 2.0 1 2 +1.0 1 1.0 1 2 1.0 2.0 1.0 2.0 1 2 +1.0 1 1.0 1 2 1.0 2.0 1.0 2.0 1 2 +NULL NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL +PREHOOK: query: -- SORT_QUERY_RESULTS +select *, rank() over(partition by key order by value) as rr from src1 PREHOOK: type: QUERY PREHOOK: Input: default@src1 #### A masked pattern was here #### -POSTHOOK: query: select *, rank() over(partition by key order by value) as rr from src1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select *, rank() over(partition by key order by value) as rr from src1 POSTHOOK: type: QUERY POSTHOOK: Input: default@src1 #### A masked pattern was here #### @@ -254,11 +272,13 @@ POSTHOOK: Input: default@src1 406 val_406 1 66 val_66 1 98 val_98 1 -PREHOOK: query: select *, rank() over(partition by key order by value) from src1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select *, rank() over(partition by key order by value) from src1 PREHOOK: type: QUERY PREHOOK: Input: default@src1 #### A masked pattern was here #### -POSTHOOK: query: select *, rank() over(partition by key order by value) from src1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select *, rank() over(partition by key order by value) from src1 POSTHOOK: type: QUERY POSTHOOK: Input: default@src1 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out b/ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out index 9274a59..feae323 100644 --- a/ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out +++ b/ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out @@ -25,9 +25,11 @@ POSTHOOK: Input: default@src POSTHOOK: Output: database:default POSTHOOK: Output: default@B Warning: Shuffle Join MERGEJOIN[11][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product -PREHOOK: query: explain select * from A join B +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join B PREHOOK: type: QUERY -POSTHOOK: query: explain select * from A join B +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join B POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -91,9 +93,11 @@ STAGE PLANS: ListSink Warning: Shuffle Join MERGEJOIN[18][tables = [d1, d2, a]] in Stage 'Reducer 3' is a cross product -PREHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from B d1 join B d2 on d1.key = d2.key join A PREHOOK: type: QUERY -POSTHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from B d1 join B d2 on d1.key = d2.key join A POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -187,14 +191,16 @@ STAGE PLANS: ListSink Warning: Shuffle Join MERGEJOIN[24][tables = [a, od1]] in Stage 'Reducer 4' is a cross product -PREHOOK: query: explain select * from A join +PREHOOK: query: -- SORT_QUERY_RESULTS +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 where 1 = 1 group by d1.key) od1 PREHOOK: type: QUERY -POSTHOOK: query: explain select * from A join +POSTHOOK: query: -- SORT_QUERY_RESULTS +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 where 1 = 1 group by d1.key) od1 POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -306,9 +312,11 @@ STAGE PLANS: Warning: Shuffle Join MERGEJOIN[17][tables = [d1, d2]] in Stage 'Reducer 2' is a cross product Warning: Shuffle Join MERGEJOIN[18][tables = [a, od1]] in Stage 'Reducer 4' is a cross product -PREHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 PREHOOK: type: QUERY -POSTHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -409,12 +417,14 @@ STAGE PLANS: ListSink Warning: Shuffle Join MERGEJOIN[29][tables = [ss, od1]] in Stage 'Reducer 3' is a cross product -PREHOOK: query: explain select * from -(select A.key from A group by key) ss join +PREHOOK: query: -- SORT_QUERY_RESULTS +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 PREHOOK: type: QUERY -POSTHOOK: query: explain select * from -(select A.key from A group by key) ss join +POSTHOOK: query: -- SORT_QUERY_RESULTS +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 POSTHOOK: type: QUERY STAGE DEPENDENCIES: diff --git a/ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out b/ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out index f732a8d..4b94a3e 100644 --- a/ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out +++ b/ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out @@ -11,23 +11,25 @@ POSTHOOK: Input: default@src POSTHOOK: Output: database:default POSTHOOK: Output: default@A PREHOOK: query: create table B as -select * from src +select * from src order by key limit 10 PREHOOK: type: CREATETABLE_AS_SELECT PREHOOK: Input: default@src PREHOOK: Output: database:default PREHOOK: Output: default@B POSTHOOK: query: create table B as -select * from src +select * from src order by key limit 10 POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@src POSTHOOK: Output: database:default POSTHOOK: Output: default@B Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Map 1' is a cross product -PREHOOK: query: explain select * from A join B +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join B PREHOOK: type: QUERY -POSTHOOK: query: explain select * from A join B +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join B POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -71,14 +73,14 @@ STAGE PLANS: Map Operator Tree: TableScan alias: b - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator sort order: - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE value expressions: _col0 (type: string), _col1 (type: string) Stage: Stage-0 @@ -88,9 +90,11 @@ STAGE PLANS: ListSink Warning: Map Join MAPJOIN[18][bigTable=a] in task 'Map 3' is a cross product -PREHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from B d1 join B d2 on d1.key = d2.key join A PREHOOK: type: QUERY -POSTHOOK: query: explain select * from B d1 join B d2 on d1.key = d2.key join A +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from B d1 join B d2 on d1.key = d2.key join A POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -108,10 +112,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d1 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -121,25 +125,25 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col5, _col6 input vertices: 1 Map 2 - Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE HybridGraceHashJoin: true Reduce Output Operator sort order: - Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE value expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string) Map 2 Map Operator Tree: TableScan alias: d2 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string) sort order: + Map-reduce partition columns: key (type: string) - Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE Column stats: NONE value expressions: value (type: string) Map 3 Map Operator Tree: @@ -176,12 +180,14 @@ STAGE PLANS: ListSink Warning: Map Join MAPJOIN[24][bigTable=a] in task 'Map 4' is a cross product -PREHOOK: query: explain select * from A join +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join (select d1.key from B d1 join B d2 on d1.key = d2.key where 1 = 1 group by d1.key) od1 PREHOOK: type: QUERY -POSTHOOK: query: explain select * from A join +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join (select d1.key from B d1 join B d2 on d1.key = d2.key where 1 = 1 group by d1.key) od1 @@ -203,10 +209,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d1 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -216,31 +222,31 @@ STAGE PLANS: outputColumnNames: _col0 input vertices: 1 Map 3 - Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE HybridGraceHashJoin: true Group By Operator keys: _col0 (type: string) mode: hash outputColumnNames: _col0 - Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE Map 3 Map Operator Tree: TableScan alias: d2 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string) sort order: + Map-reduce partition columns: key (type: string) - Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE Column stats: NONE Map 4 Map Operator Tree: TableScan @@ -274,10 +280,10 @@ STAGE PLANS: keys: KEY._col0 (type: string) mode: mergepartial outputColumnNames: _col0 - Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 2 Data size: 20 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator sort order: - Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 2 Data size: 20 Basic stats: COMPLETE Column stats: NONE value expressions: _col0 (type: string) Stage: Stage-0 @@ -288,9 +294,11 @@ STAGE PLANS: Warning: Map Join MAPJOIN[17][bigTable=d1] in task 'Map 1' is a cross product Warning: Map Join MAPJOIN[18][bigTable=a] in task 'Map 4' is a cross product -PREHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 PREHOOK: type: QUERY -POSTHOOK: query: explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from A join (select d1.key from B d1 join B d2 where 1 = 1 group by d1.key) od1 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -309,7 +317,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d1 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -319,26 +327,26 @@ STAGE PLANS: outputColumnNames: _col0 input vertices: 1 Map 3 - Statistics: Num rows: 11 Data size: 114 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 105 Basic stats: COMPLETE Column stats: NONE HybridGraceHashJoin: true Group By Operator keys: _col0 (type: string) mode: hash outputColumnNames: _col0 - Statistics: Num rows: 11 Data size: 114 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 105 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 11 Data size: 114 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 105 Basic stats: COMPLETE Column stats: NONE Map 3 Map Operator Tree: TableScan alias: d2 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator sort order: - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: COMPLETE Map 4 Map Operator Tree: TableScan @@ -372,10 +380,10 @@ STAGE PLANS: keys: KEY._col0 (type: string) mode: mergepartial outputColumnNames: _col0 - Statistics: Num rows: 5 Data size: 51 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 47 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator sort order: - Statistics: Num rows: 5 Data size: 51 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 47 Basic stats: COMPLETE Column stats: NONE value expressions: _col0 (type: string) Stage: Stage-0 @@ -385,11 +393,13 @@ STAGE PLANS: ListSink Warning: Map Join MAPJOIN[29][bigTable=?] in task 'Reducer 2' is a cross product -PREHOOK: query: explain select * from +PREHOOK: query: -- SORT_QUERY_RESULTS +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 PREHOOK: type: QUERY -POSTHOOK: query: explain select * from +POSTHOOK: query: -- SORT_QUERY_RESULTS +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 POSTHOOK: type: QUERY @@ -429,10 +439,10 @@ STAGE PLANS: Map Operator Tree: TableScan alias: d1 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Inner Join 0 to 1 @@ -442,31 +452,31 @@ STAGE PLANS: outputColumnNames: _col0 input vertices: 1 Map 5 - Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE HybridGraceHashJoin: true Group By Operator keys: _col0 (type: string) mode: hash outputColumnNames: _col0 - Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: string) sort order: + Map-reduce partition columns: _col0 (type: string) - Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE Map 5 Map Operator Tree: TableScan alias: d2 - Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: key is not null (type: boolean) - Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: key (type: string) sort order: + Map-reduce partition columns: key (type: string) - Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE Column stats: NONE Reducer 2 Reduce Operator Tree: Group By Operator @@ -498,10 +508,10 @@ STAGE PLANS: keys: KEY._col0 (type: string) mode: mergepartial outputColumnNames: _col0 - Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 2 Data size: 20 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator sort order: - Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 2 Data size: 20 Basic stats: COMPLETE Column stats: NONE value expressions: _col0 (type: string) Stage: Stage-0 diff --git a/ql/src/test/results/clientpositive/tez/ctas.q.out b/ql/src/test/results/clientpositive/tez/ctas.q.out index d576fa5..91e7f50 100644 --- a/ql/src/test/results/clientpositive/tez/ctas.q.out +++ b/ql/src/test/results/clientpositive/tez/ctas.q.out @@ -112,11 +112,13 @@ POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@src POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_CTAS1 -PREHOOK: query: select * from nzhang_CTAS1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_CTAS1 PREHOOK: type: QUERY PREHOOK: Input: default@nzhang_ctas1 #### A masked pattern was here #### -POSTHOOK: query: select * from nzhang_CTAS1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_CTAS1 POSTHOOK: type: QUERY POSTHOOK: Input: default@nzhang_ctas1 #### A masked pattern was here #### @@ -260,11 +262,13 @@ POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@src POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_ctas2 -PREHOOK: query: select * from nzhang_ctas2 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas2 PREHOOK: type: QUERY PREHOOK: Input: default@nzhang_ctas2 #### A masked pattern was here #### -POSTHOOK: query: select * from nzhang_ctas2 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas2 POSTHOOK: type: QUERY POSTHOOK: Input: default@nzhang_ctas2 #### A masked pattern was here #### @@ -408,11 +412,13 @@ POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@src POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_ctas3 -PREHOOK: query: select * from nzhang_ctas3 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas3 PREHOOK: type: QUERY PREHOOK: Input: default@nzhang_ctas3 #### A masked pattern was here #### -POSTHOOK: query: select * from nzhang_ctas3 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas3 POSTHOOK: type: QUERY POSTHOOK: Input: default@nzhang_ctas3 #### A masked pattern was here #### @@ -473,11 +479,13 @@ PREHOOK: query: create table if not exists nzhang_ctas3 as select key, value fro PREHOOK: type: CREATETABLE POSTHOOK: query: create table if not exists nzhang_ctas3 as select key, value from src sort by key, value limit 2 POSTHOOK: type: CREATETABLE -PREHOOK: query: select * from nzhang_ctas3 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas3 PREHOOK: type: QUERY PREHOOK: Input: default@nzhang_ctas3 #### A masked pattern was here #### -POSTHOOK: query: select * from nzhang_ctas3 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas3 POSTHOOK: type: QUERY POSTHOOK: Input: default@nzhang_ctas3 #### A masked pattern was here #### @@ -622,11 +630,13 @@ POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@src POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_ctas4 -PREHOOK: query: select * from nzhang_ctas4 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas4 PREHOOK: type: QUERY PREHOOK: Input: default@nzhang_ctas4 #### A masked pattern was here #### -POSTHOOK: query: select * from nzhang_ctas4 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from nzhang_ctas4 POSTHOOK: type: QUERY POSTHOOK: Input: default@nzhang_ctas4 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/tez/dynpart_sort_optimization2.q.out b/ql/src/test/results/clientpositive/tez/dynpart_sort_optimization2.q.out index 5880ba0..166e505 100644 --- a/ql/src/test/results/clientpositive/tez/dynpart_sort_optimization2.q.out +++ b/ql/src/test/results/clientpositive/tez/dynpart_sort_optimization2.q.out @@ -50,7 +50,8 @@ POSTHOOK: query: load data local inpath '../../data/files/dynpart_test.txt' over POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@ss -PREHOOK: query: explain insert overwrite table ss_part partition (ss_sold_date_sk) +PREHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -61,7 +62,8 @@ select ss_net_paid_inc_tax, ss_net_profit distribute by ss_sold_date_sk PREHOOK: type: QUERY -POSTHOOK: query: explain insert overwrite table ss_part partition (ss_sold_date_sk) +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -141,7 +143,8 @@ STAGE PLANS: Stage: Stage-3 Stats-Aggr Operator -PREHOOK: query: insert overwrite table ss_part partition (ss_sold_date_sk) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -154,7 +157,8 @@ select ss_net_paid_inc_tax, PREHOOK: type: QUERY PREHOOK: Input: default@ss PREHOOK: Output: default@ss_part -POSTHOOK: query: insert overwrite table ss_part partition (ss_sold_date_sk) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -213,27 +217,29 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part where ss_sold_date_sk=2452617 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452617 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part PREHOOK: Input: default@ss_part@ss_sold_date_sk=2452617 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part where ss_sold_date_sk=2452617 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452617 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part POSTHOOK: Input: default@ss_part@ss_sold_date_sk=2452617 #### A masked pattern was here #### +10022.63 3952.8 2452617 +1765.07 -4648.8 2452617 2.1 -2026.3 2452617 2.99 -11.32 2452617 -85.8 25.61 2452617 -552.96 -1363.84 2452617 -565.92 196.48 2452617 -879.07 -2185.76 2452617 -1765.07 -4648.8 2452617 3423.95 -3164.07 2452617 5362.01 -600.28 2452617 +552.96 -1363.84 2452617 +565.92 196.48 2452617 7412.83 2071.68 2452617 -10022.63 3952.8 2452617 +85.8 25.61 2452617 +879.07 -2185.76 2452617 PREHOOK: query: desc formatted ss_part partition(ss_sold_date_sk=2452638) PREHOOK: type: DESCTABLE PREHOOK: Input: default@ss_part @@ -275,30 +281,33 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part where ss_sold_date_sk=2452638 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452638 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part PREHOOK: Input: default@ss_part@ss_sold_date_sk=2452638 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part where ss_sold_date_sk=2452638 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452638 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part POSTHOOK: Input: default@ss_part@ss_sold_date_sk=2452638 #### A masked pattern was here #### 0.15 -241.22 2452638 +10171.1 660.48 2452638 +1327.08 57.97 2452638 +1413.19 178.08 2452638 150.39 -162.12 2452638 +1524.33 494.37 2452638 156.67 -4626.56 2452638 181.03 -207.24 2452638 +1971.35 -488.25 2452638 267.01 -3266.36 2452638 317.87 -3775.38 2452638 -1327.08 57.97 2452638 -1413.19 178.08 2452638 -1524.33 494.37 2452638 -1971.35 -488.25 2452638 4133.98 -775.72 2452638 4329.49 -4000.51 2452638 -10171.1 660.48 2452638 -PREHOOK: query: explain insert overwrite table ss_part partition (ss_sold_date_sk) +PREHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -306,7 +315,8 @@ select ss_net_paid_inc_tax, where ss_sold_date_sk>=2452617 and ss_sold_date_sk<=2452638 distribute by ss_sold_date_sk PREHOOK: type: QUERY -POSTHOOK: query: explain insert overwrite table ss_part partition (ss_sold_date_sk) +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -378,7 +388,8 @@ STAGE PLANS: Stage: Stage-3 Stats-Aggr Operator -PREHOOK: query: insert overwrite table ss_part partition (ss_sold_date_sk) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -388,7 +399,8 @@ select ss_net_paid_inc_tax, PREHOOK: type: QUERY PREHOOK: Input: default@ss PREHOOK: Output: default@ss_part -POSTHOOK: query: insert overwrite table ss_part partition (ss_sold_date_sk) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -444,27 +456,29 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part where ss_sold_date_sk=2452617 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452617 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part PREHOOK: Input: default@ss_part@ss_sold_date_sk=2452617 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part where ss_sold_date_sk=2452617 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452617 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part POSTHOOK: Input: default@ss_part@ss_sold_date_sk=2452617 #### A masked pattern was here #### 10022.63 3952.8 2452617 +1765.07 -4648.8 2452617 +2.1 -2026.3 2452617 2.99 -11.32 2452617 3423.95 -3164.07 2452617 5362.01 -600.28 2452617 +552.96 -1363.84 2452617 565.92 196.48 2452617 -85.8 25.61 2452617 7412.83 2071.68 2452617 +85.8 25.61 2452617 879.07 -2185.76 2452617 -1765.07 -4648.8 2452617 -552.96 -1363.84 2452617 -2.1 -2026.3 2452617 PREHOOK: query: desc formatted ss_part partition(ss_sold_date_sk=2452638) PREHOOK: type: DESCTABLE PREHOOK: Input: default@ss_part @@ -506,31 +520,34 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part where ss_sold_date_sk=2452638 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452638 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part PREHOOK: Input: default@ss_part@ss_sold_date_sk=2452638 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part where ss_sold_date_sk=2452638 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452638 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part POSTHOOK: Input: default@ss_part@ss_sold_date_sk=2452638 #### A masked pattern was here #### -4329.49 -4000.51 2452638 +0.15 -241.22 2452638 +10171.1 660.48 2452638 +1327.08 57.97 2452638 1413.19 178.08 2452638 150.39 -162.12 2452638 1524.33 494.37 2452638 -0.15 -241.22 2452638 -267.01 -3266.36 2452638 +156.67 -4626.56 2452638 181.03 -207.24 2452638 1971.35 -488.25 2452638 -1327.08 57.97 2452638 -156.67 -4626.56 2452638 +267.01 -3266.36 2452638 317.87 -3775.38 2452638 -10171.1 660.48 2452638 4133.98 -775.72 2452638 +4329.49 -4000.51 2452638 PREHOOK: query: -- SORT DYNAMIC PARTITION DISABLED +-- SORT_QUERY_RESULTS explain insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, @@ -544,6 +561,7 @@ select ss_net_paid_inc_tax, PREHOOK: type: QUERY POSTHOOK: query: -- SORT DYNAMIC PARTITION DISABLED +-- SORT_QUERY_RESULTS explain insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, @@ -624,7 +642,8 @@ STAGE PLANS: Stage: Stage-3 Stats-Aggr Operator -PREHOOK: query: insert overwrite table ss_part partition (ss_sold_date_sk) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -637,7 +656,8 @@ select ss_net_paid_inc_tax, PREHOOK: type: QUERY PREHOOK: Input: default@ss PREHOOK: Output: default@ss_part -POSTHOOK: query: insert overwrite table ss_part partition (ss_sold_date_sk) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -696,27 +716,29 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part where ss_sold_date_sk=2452617 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452617 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part PREHOOK: Input: default@ss_part@ss_sold_date_sk=2452617 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part where ss_sold_date_sk=2452617 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452617 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part POSTHOOK: Input: default@ss_part@ss_sold_date_sk=2452617 #### A masked pattern was here #### +10022.63 3952.8 2452617 +1765.07 -4648.8 2452617 2.1 -2026.3 2452617 2.99 -11.32 2452617 -85.8 25.61 2452617 -552.96 -1363.84 2452617 -565.92 196.48 2452617 -879.07 -2185.76 2452617 -1765.07 -4648.8 2452617 3423.95 -3164.07 2452617 5362.01 -600.28 2452617 +552.96 -1363.84 2452617 +565.92 196.48 2452617 7412.83 2071.68 2452617 -10022.63 3952.8 2452617 +85.8 25.61 2452617 +879.07 -2185.76 2452617 PREHOOK: query: desc formatted ss_part partition(ss_sold_date_sk=2452638) PREHOOK: type: DESCTABLE PREHOOK: Input: default@ss_part @@ -758,30 +780,33 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part where ss_sold_date_sk=2452638 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452638 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part PREHOOK: Input: default@ss_part@ss_sold_date_sk=2452638 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part where ss_sold_date_sk=2452638 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452638 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part POSTHOOK: Input: default@ss_part@ss_sold_date_sk=2452638 #### A masked pattern was here #### 0.15 -241.22 2452638 +10171.1 660.48 2452638 +1327.08 57.97 2452638 +1413.19 178.08 2452638 150.39 -162.12 2452638 +1524.33 494.37 2452638 156.67 -4626.56 2452638 181.03 -207.24 2452638 +1971.35 -488.25 2452638 267.01 -3266.36 2452638 317.87 -3775.38 2452638 -1327.08 57.97 2452638 -1413.19 178.08 2452638 -1524.33 494.37 2452638 -1971.35 -488.25 2452638 4133.98 -775.72 2452638 4329.49 -4000.51 2452638 -10171.1 660.48 2452638 -PREHOOK: query: explain insert overwrite table ss_part partition (ss_sold_date_sk) +PREHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -789,7 +814,8 @@ select ss_net_paid_inc_tax, where ss_sold_date_sk>=2452617 and ss_sold_date_sk<=2452638 distribute by ss_sold_date_sk PREHOOK: type: QUERY -POSTHOOK: query: explain insert overwrite table ss_part partition (ss_sold_date_sk) +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -860,7 +886,8 @@ STAGE PLANS: Stage: Stage-3 Stats-Aggr Operator -PREHOOK: query: insert overwrite table ss_part partition (ss_sold_date_sk) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -870,7 +897,8 @@ select ss_net_paid_inc_tax, PREHOOK: type: QUERY PREHOOK: Input: default@ss PREHOOK: Output: default@ss_part -POSTHOOK: query: insert overwrite table ss_part partition (ss_sold_date_sk) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -926,27 +954,29 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part where ss_sold_date_sk=2452617 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452617 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part PREHOOK: Input: default@ss_part@ss_sold_date_sk=2452617 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part where ss_sold_date_sk=2452617 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452617 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part POSTHOOK: Input: default@ss_part@ss_sold_date_sk=2452617 #### A masked pattern was here #### +10022.63 3952.8 2452617 +1765.07 -4648.8 2452617 +2.1 -2026.3 2452617 +2.99 -11.32 2452617 3423.95 -3164.07 2452617 5362.01 -600.28 2452617 +552.96 -1363.84 2452617 565.92 196.48 2452617 -85.8 25.61 2452617 7412.83 2071.68 2452617 +85.8 25.61 2452617 879.07 -2185.76 2452617 -1765.07 -4648.8 2452617 -552.96 -1363.84 2452617 -2.1 -2026.3 2452617 -10022.63 3952.8 2452617 -2.99 -11.32 2452617 PREHOOK: query: desc formatted ss_part partition(ss_sold_date_sk=2452638) PREHOOK: type: DESCTABLE PREHOOK: Input: default@ss_part @@ -988,31 +1018,34 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part where ss_sold_date_sk=2452638 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452638 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part PREHOOK: Input: default@ss_part@ss_sold_date_sk=2452638 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part where ss_sold_date_sk=2452638 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part where ss_sold_date_sk=2452638 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part POSTHOOK: Input: default@ss_part@ss_sold_date_sk=2452638 #### A masked pattern was here #### -4329.49 -4000.51 2452638 +0.15 -241.22 2452638 +10171.1 660.48 2452638 +1327.08 57.97 2452638 1413.19 178.08 2452638 150.39 -162.12 2452638 1524.33 494.37 2452638 -0.15 -241.22 2452638 -267.01 -3266.36 2452638 +156.67 -4626.56 2452638 181.03 -207.24 2452638 1971.35 -488.25 2452638 -1327.08 57.97 2452638 -156.67 -4626.56 2452638 +267.01 -3266.36 2452638 317.87 -3775.38 2452638 -10171.1 660.48 2452638 4133.98 -775.72 2452638 +4329.49 -4000.51 2452638 PREHOOK: query: -- VECTORIZATION IS ENABLED +-- SORT_QUERY_RESULTS create table ss_orc ( ss_sold_date_sk int, ss_net_paid_inc_tax float, @@ -1022,6 +1055,7 @@ PREHOOK: Output: database:default PREHOOK: Output: default@ss_orc POSTHOOK: query: -- VECTORIZATION IS ENABLED +-- SORT_QUERY_RESULTS create table ss_orc ( ss_sold_date_sk int, ss_net_paid_inc_tax float, @@ -1029,25 +1063,29 @@ ss_net_profit float) stored as orc POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@ss_orc -PREHOOK: query: create table ss_part_orc ( +PREHOOK: query: -- SORT_QUERY_RESULTS +create table ss_part_orc ( ss_net_paid_inc_tax float, ss_net_profit float) partitioned by (ss_sold_date_sk int) stored as orc PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@ss_part_orc -POSTHOOK: query: create table ss_part_orc ( +POSTHOOK: query: -- SORT_QUERY_RESULTS +create table ss_part_orc ( ss_net_paid_inc_tax float, ss_net_profit float) partitioned by (ss_sold_date_sk int) stored as orc POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@ss_part_orc -PREHOOK: query: insert overwrite table ss_orc select * from ss +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_orc select * from ss PREHOOK: type: QUERY PREHOOK: Input: default@ss PREHOOK: Output: default@ss_orc -POSTHOOK: query: insert overwrite table ss_orc select * from ss +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_orc select * from ss POSTHOOK: type: QUERY POSTHOOK: Input: default@ss POSTHOOK: Output: default@ss_orc @@ -1070,7 +1108,8 @@ POSTHOOK: query: drop table ss_part POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@ss_part POSTHOOK: Output: default@ss_part -PREHOOK: query: explain insert overwrite table ss_part_orc partition (ss_sold_date_sk) +PREHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table ss_part_orc partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -1081,7 +1120,8 @@ select ss_net_paid_inc_tax, ss_net_profit distribute by ss_sold_date_sk PREHOOK: type: QUERY -POSTHOOK: query: explain insert overwrite table ss_part_orc partition (ss_sold_date_sk) +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table ss_part_orc partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -1163,7 +1203,8 @@ STAGE PLANS: Stage: Stage-3 Stats-Aggr Operator -PREHOOK: query: insert overwrite table ss_part_orc partition (ss_sold_date_sk) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part_orc partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -1176,7 +1217,8 @@ select ss_net_paid_inc_tax, PREHOOK: type: QUERY PREHOOK: Input: default@ss_orc PREHOOK: Output: default@ss_part_orc -POSTHOOK: query: insert overwrite table ss_part_orc partition (ss_sold_date_sk) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part_orc partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -1235,27 +1277,29 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part_orc where ss_sold_date_sk=2452617 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part_orc where ss_sold_date_sk=2452617 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part_orc PREHOOK: Input: default@ss_part_orc@ss_sold_date_sk=2452617 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part_orc where ss_sold_date_sk=2452617 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part_orc where ss_sold_date_sk=2452617 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part_orc POSTHOOK: Input: default@ss_part_orc@ss_sold_date_sk=2452617 #### A masked pattern was here #### +10022.63 3952.8 2452617 +1765.07 -4648.8 2452617 2.1 -2026.3 2452617 2.99 -11.32 2452617 -85.8 25.61 2452617 -552.96 -1363.84 2452617 -565.92 196.48 2452617 -879.07 -2185.76 2452617 -1765.07 -4648.8 2452617 3423.95 -3164.07 2452617 5362.01 -600.28 2452617 +552.96 -1363.84 2452617 +565.92 196.48 2452617 7412.83 2071.68 2452617 -10022.63 3952.8 2452617 +85.8 25.61 2452617 +879.07 -2185.76 2452617 PREHOOK: query: desc formatted ss_part_orc partition(ss_sold_date_sk=2452638) PREHOOK: type: DESCTABLE PREHOOK: Input: default@ss_part_orc @@ -1297,30 +1341,33 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part_orc where ss_sold_date_sk=2452638 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part_orc where ss_sold_date_sk=2452638 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part_orc PREHOOK: Input: default@ss_part_orc@ss_sold_date_sk=2452638 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part_orc where ss_sold_date_sk=2452638 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part_orc where ss_sold_date_sk=2452638 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part_orc POSTHOOK: Input: default@ss_part_orc@ss_sold_date_sk=2452638 #### A masked pattern was here #### 0.15 -241.22 2452638 +10171.1 660.48 2452638 +1327.08 57.97 2452638 +1413.19 178.08 2452638 150.39 -162.12 2452638 +1524.33 494.37 2452638 156.67 -4626.56 2452638 181.03 -207.24 2452638 +1971.35 -488.25 2452638 267.01 -3266.36 2452638 317.87 -3775.38 2452638 -1327.08 57.97 2452638 -1413.19 178.08 2452638 -1524.33 494.37 2452638 -1971.35 -488.25 2452638 4133.98 -775.72 2452638 4329.49 -4000.51 2452638 -10171.1 660.48 2452638 -PREHOOK: query: explain insert overwrite table ss_part_orc partition (ss_sold_date_sk) +PREHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table ss_part_orc partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -1328,7 +1375,8 @@ select ss_net_paid_inc_tax, where ss_sold_date_sk>=2452617 and ss_sold_date_sk<=2452638 distribute by ss_sold_date_sk PREHOOK: type: QUERY -POSTHOOK: query: explain insert overwrite table ss_part_orc partition (ss_sold_date_sk) +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table ss_part_orc partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -1401,7 +1449,8 @@ STAGE PLANS: Stage: Stage-3 Stats-Aggr Operator -PREHOOK: query: insert overwrite table ss_part_orc partition (ss_sold_date_sk) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part_orc partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -1411,7 +1460,8 @@ select ss_net_paid_inc_tax, PREHOOK: type: QUERY PREHOOK: Input: default@ss_orc PREHOOK: Output: default@ss_part_orc -POSTHOOK: query: insert overwrite table ss_part_orc partition (ss_sold_date_sk) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table ss_part_orc partition (ss_sold_date_sk) select ss_net_paid_inc_tax, ss_net_profit, ss_sold_date_sk @@ -1467,27 +1517,29 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part_orc where ss_sold_date_sk=2452617 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part_orc where ss_sold_date_sk=2452617 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part_orc PREHOOK: Input: default@ss_part_orc@ss_sold_date_sk=2452617 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part_orc where ss_sold_date_sk=2452617 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part_orc where ss_sold_date_sk=2452617 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part_orc POSTHOOK: Input: default@ss_part_orc@ss_sold_date_sk=2452617 #### A masked pattern was here #### +10022.63 3952.8 2452617 +1765.07 -4648.8 2452617 +2.1 -2026.3 2452617 +2.99 -11.32 2452617 3423.95 -3164.07 2452617 5362.01 -600.28 2452617 +552.96 -1363.84 2452617 565.92 196.48 2452617 -85.8 25.61 2452617 7412.83 2071.68 2452617 +85.8 25.61 2452617 879.07 -2185.76 2452617 -1765.07 -4648.8 2452617 -552.96 -1363.84 2452617 -2.1 -2026.3 2452617 -10022.63 3952.8 2452617 -2.99 -11.32 2452617 PREHOOK: query: desc formatted ss_part_orc partition(ss_sold_date_sk=2452638) PREHOOK: type: DESCTABLE PREHOOK: Input: default@ss_part_orc @@ -1529,29 +1581,31 @@ Bucket Columns: [] Sort Columns: [] Storage Desc Params: serialization.format 1 -PREHOOK: query: select * from ss_part_orc where ss_sold_date_sk=2452638 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part_orc where ss_sold_date_sk=2452638 PREHOOK: type: QUERY PREHOOK: Input: default@ss_part_orc PREHOOK: Input: default@ss_part_orc@ss_sold_date_sk=2452638 #### A masked pattern was here #### -POSTHOOK: query: select * from ss_part_orc where ss_sold_date_sk=2452638 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from ss_part_orc where ss_sold_date_sk=2452638 POSTHOOK: type: QUERY POSTHOOK: Input: default@ss_part_orc POSTHOOK: Input: default@ss_part_orc@ss_sold_date_sk=2452638 #### A masked pattern was here #### -4329.49 -4000.51 2452638 +0.15 -241.22 2452638 +10171.1 660.48 2452638 +1327.08 57.97 2452638 1413.19 178.08 2452638 150.39 -162.12 2452638 1524.33 494.37 2452638 -0.15 -241.22 2452638 -267.01 -3266.36 2452638 +156.67 -4626.56 2452638 181.03 -207.24 2452638 1971.35 -488.25 2452638 -1327.08 57.97 2452638 -156.67 -4626.56 2452638 +267.01 -3266.36 2452638 317.87 -3775.38 2452638 -10171.1 660.48 2452638 4133.98 -775.72 2452638 +4329.49 -4000.51 2452638 PREHOOK: query: drop table ss_orc PREHOOK: type: DROPTABLE PREHOOK: Input: default@ss_orc @@ -1572,7 +1626,8 @@ PREHOOK: query: drop table if exists hive13_dp1 PREHOOK: type: DROPTABLE POSTHOOK: query: drop table if exists hive13_dp1 POSTHOOK: type: DROPTABLE -PREHOOK: query: create table if not exists hive13_dp1 ( +PREHOOK: query: -- SORT_QUERY_RESULTS +create table if not exists hive13_dp1 ( k1 int, k2 int ) @@ -1581,7 +1636,8 @@ STORED AS ORC PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@hive13_dp1 -POSTHOOK: query: create table if not exists hive13_dp1 ( +POSTHOOK: query: -- SORT_QUERY_RESULTS +create table if not exists hive13_dp1 ( k1 int, k2 int ) @@ -1590,7 +1646,8 @@ STORED AS ORC POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@hive13_dp1 -PREHOOK: query: explain insert overwrite table `hive13_dp1` partition(`day`) +PREHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table `hive13_dp1` partition(`day`) select key k1, count(value) k2, @@ -1598,7 +1655,8 @@ select from src group by "day", key PREHOOK: type: QUERY -POSTHOOK: query: explain insert overwrite table `hive13_dp1` partition(`day`) +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table `hive13_dp1` partition(`day`) select key k1, count(value) k2, @@ -1680,7 +1738,8 @@ STAGE PLANS: Stage: Stage-3 Stats-Aggr Operator -PREHOOK: query: insert overwrite table `hive13_dp1` partition(`day`) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table `hive13_dp1` partition(`day`) select key k1, count(value) k2, @@ -1690,7 +1749,8 @@ group by "day", key PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@hive13_dp1 -POSTHOOK: query: insert overwrite table `hive13_dp1` partition(`day`) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table `hive13_dp1` partition(`day`) select key k1, count(value) k2, @@ -1702,22 +1762,25 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@hive13_dp1@day=day POSTHOOK: Lineage: hive13_dp1 PARTITION(day=day).k1 EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: hive13_dp1 PARTITION(day=day).k2 EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: select * from hive13_dp1 limit 5 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from hive13_dp1 order by k1, k2 limit 5 PREHOOK: type: QUERY PREHOOK: Input: default@hive13_dp1 PREHOOK: Input: default@hive13_dp1@day=day #### A masked pattern was here #### -POSTHOOK: query: select * from hive13_dp1 limit 5 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from hive13_dp1 order by k1, k2 limit 5 POSTHOOK: type: QUERY POSTHOOK: Input: default@hive13_dp1 POSTHOOK: Input: default@hive13_dp1@day=day #### A masked pattern was here #### 0 3 day -10 1 day -100 2 day -103 2 day -104 2 day -PREHOOK: query: explain insert overwrite table `hive13_dp1` partition(`day`) +2 1 day +4 1 day +5 3 day +8 1 day +PREHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table `hive13_dp1` partition(`day`) select key k1, count(value) k2, @@ -1725,7 +1788,8 @@ select from src group by "day", key PREHOOK: type: QUERY -POSTHOOK: query: explain insert overwrite table `hive13_dp1` partition(`day`) +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain insert overwrite table `hive13_dp1` partition(`day`) select key k1, count(value) k2, @@ -1807,7 +1871,8 @@ STAGE PLANS: Stage: Stage-3 Stats-Aggr Operator -PREHOOK: query: insert overwrite table `hive13_dp1` partition(`day`) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table `hive13_dp1` partition(`day`) select key k1, count(value) k2, @@ -1817,7 +1882,8 @@ group by "day", key PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@hive13_dp1 -POSTHOOK: query: insert overwrite table `hive13_dp1` partition(`day`) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table `hive13_dp1` partition(`day`) select key k1, count(value) k2, @@ -1829,21 +1895,23 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@hive13_dp1@day=day POSTHOOK: Lineage: hive13_dp1 PARTITION(day=day).k1 EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: hive13_dp1 PARTITION(day=day).k2 EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: select * from hive13_dp1 limit 5 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from hive13_dp1 order by k1, k2 limit 5 PREHOOK: type: QUERY PREHOOK: Input: default@hive13_dp1 PREHOOK: Input: default@hive13_dp1@day=day #### A masked pattern was here #### -POSTHOOK: query: select * from hive13_dp1 limit 5 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from hive13_dp1 order by k1, k2 limit 5 POSTHOOK: type: QUERY POSTHOOK: Input: default@hive13_dp1 POSTHOOK: Input: default@hive13_dp1@day=day #### A masked pattern was here #### 0 3 day -10 1 day -100 2 day -103 2 day -104 2 day +2 1 day +4 1 day +5 3 day +8 1 day PREHOOK: query: drop table hive13_dp1 PREHOOK: type: DROPTABLE PREHOOK: Input: default@hive13_dp1 diff --git a/ql/src/test/results/clientpositive/tez/explainuser_2.q.out b/ql/src/test/results/clientpositive/tez/explainuser_2.q.out index f7026a8..0d57e58 100644 --- a/ql/src/test/results/clientpositive/tez/explainuser_2.q.out +++ b/ql/src/test/results/clientpositive/tez/explainuser_2.q.out @@ -1,36 +1,45 @@ -PREHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE +PREHOOK: query: -- SORT_QUERY_RESULTS +CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@dest_j1 -POSTHOOK: query: CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE +POSTHOOK: query: -- SORT_QUERY_RESULTS +CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 -PREHOOK: query: CREATE TABLE ss(k1 STRING,v1 STRING,k2 STRING,v2 STRING,k3 STRING,v3 STRING) STORED AS TEXTFILE +PREHOOK: query: -- SORT_QUERY_RESULTS +CREATE TABLE ss(k1 STRING,v1 STRING,k2 STRING,v2 STRING,k3 STRING,v3 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@ss -POSTHOOK: query: CREATE TABLE ss(k1 STRING,v1 STRING,k2 STRING,v2 STRING,k3 STRING,v3 STRING) STORED AS TEXTFILE +POSTHOOK: query: -- SORT_QUERY_RESULTS +CREATE TABLE ss(k1 STRING,v1 STRING,k2 STRING,v2 STRING,k3 STRING,v3 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@ss -PREHOOK: query: CREATE TABLE sr(k1 STRING,v1 STRING,k2 STRING,v2 STRING,k3 STRING,v3 STRING) STORED AS TEXTFILE +PREHOOK: query: -- SORT_QUERY_RESULTS +CREATE TABLE sr(k1 STRING,v1 STRING,k2 STRING,v2 STRING,k3 STRING,v3 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@sr -POSTHOOK: query: CREATE TABLE sr(k1 STRING,v1 STRING,k2 STRING,v2 STRING,k3 STRING,v3 STRING) STORED AS TEXTFILE +POSTHOOK: query: -- SORT_QUERY_RESULTS +CREATE TABLE sr(k1 STRING,v1 STRING,k2 STRING,v2 STRING,k3 STRING,v3 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@sr -PREHOOK: query: CREATE TABLE cs(k1 STRING,v1 STRING,k2 STRING,v2 STRING,k3 STRING,v3 STRING) STORED AS TEXTFILE +PREHOOK: query: -- SORT_QUERY_RESULTS +CREATE TABLE cs(k1 STRING,v1 STRING,k2 STRING,v2 STRING,k3 STRING,v3 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@cs -POSTHOOK: query: CREATE TABLE cs(k1 STRING,v1 STRING,k2 STRING,v2 STRING,k3 STRING,v3 STRING) STORED AS TEXTFILE +POSTHOOK: query: -- SORT_QUERY_RESULTS +CREATE TABLE cs(k1 STRING,v1 STRING,k2 STRING,v2 STRING,k3 STRING,v3 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@cs -PREHOOK: query: INSERT OVERWRITE TABLE ss +PREHOOK: query: -- SORT_QUERY_RESULTS +INSERT OVERWRITE TABLE ss SELECT x.key,x.value,y.key,y.value,z.key,z.value FROM src1 x JOIN src y ON (x.key = y.key) @@ -41,7 +50,8 @@ PREHOOK: Input: default@src1 PREHOOK: Input: default@srcpart PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 PREHOOK: Output: default@ss -POSTHOOK: query: INSERT OVERWRITE TABLE ss +POSTHOOK: query: -- SORT_QUERY_RESULTS +INSERT OVERWRITE TABLE ss SELECT x.key,x.value,y.key,y.value,z.key,z.value FROM src1 x JOIN src y ON (x.key = y.key) @@ -58,7 +68,8 @@ POSTHOOK: Lineage: ss.k3 SIMPLE [(srcpart)z.FieldSchema(name:key, type:string, c POSTHOOK: Lineage: ss.v1 SIMPLE [(src1)x.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: ss.v2 EXPRESSION [(src)y.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: ss.v3 SIMPLE [(srcpart)z.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: INSERT OVERWRITE TABLE sr +PREHOOK: query: -- SORT_QUERY_RESULTS +INSERT OVERWRITE TABLE sr SELECT x.key,x.value,y.key,y.value,z.key,z.value FROM src1 x JOIN src y ON (x.key = y.key) @@ -69,7 +80,8 @@ PREHOOK: Input: default@src1 PREHOOK: Input: default@srcpart PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 PREHOOK: Output: default@sr -POSTHOOK: query: INSERT OVERWRITE TABLE sr +POSTHOOK: query: -- SORT_QUERY_RESULTS +INSERT OVERWRITE TABLE sr SELECT x.key,x.value,y.key,y.value,z.key,z.value FROM src1 x JOIN src y ON (x.key = y.key) @@ -86,7 +98,8 @@ POSTHOOK: Lineage: sr.k3 SIMPLE [(srcpart)z.FieldSchema(name:key, type:string, c POSTHOOK: Lineage: sr.v1 SIMPLE [(src1)x.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: sr.v2 EXPRESSION [(src)y.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: sr.v3 SIMPLE [(srcpart)z.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: INSERT OVERWRITE TABLE cs +PREHOOK: query: -- SORT_QUERY_RESULTS +INSERT OVERWRITE TABLE cs SELECT x.key,x.value,y.key,y.value,z.key,z.value FROM src1 x JOIN src y ON (x.key = y.key) @@ -98,7 +111,8 @@ PREHOOK: Input: default@srcpart PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 PREHOOK: Output: default@cs -POSTHOOK: query: INSERT OVERWRITE TABLE cs +POSTHOOK: query: -- SORT_QUERY_RESULTS +INSERT OVERWRITE TABLE cs SELECT x.key,x.value,y.key,y.value,z.key,z.value FROM src1 x JOIN src y ON (x.key = y.key) @@ -164,12 +178,14 @@ POSTHOOK: query: ANALYZE TABLE cs COMPUTE STATISTICS FOR COLUMNS k1,v1,k2,v2,k3, POSTHOOK: type: QUERY POSTHOOK: Input: default@cs #### A masked pattern was here #### -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN SELECT x.key, z.value, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=11) PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN SELECT x.key, z.value, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=11) @@ -256,7 +272,8 @@ Stage-0 TableScan [TS_5] alias:x Statistics:Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN select ss.k1,sr.k2,cs.k3,count(ss.v1),count(sr.v2),count(cs.v3) FROM @@ -284,7 +301,8 @@ order by ss.k1,sr.k2,cs.k3 limit 100 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN select ss.k1,sr.k2,cs.k3,count(ss.v1),count(sr.v2),count(cs.v3) FROM @@ -569,7 +587,8 @@ Stage-0 TableScan [TS_5] alias:sr Statistics:Num rows: 85 Data size: 2945 Basic stats: COMPLETE Column stats: NONE -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT x.key, z.value, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN (select * from src1 union select * from src)z ON (x.value = z.value) @@ -578,7 +597,8 @@ SELECT x.key, z.value, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN (select * from src1 union select * from src)z ON (x.value = z.value) PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT x.key, z.value, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN (select * from src1 union select * from src)z ON (x.value = z.value) @@ -814,7 +834,8 @@ Stage-0 predicate:value is not null (type: boolean) TableScan [TS_31] alias:y -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT x.key, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN (select * from src1 union select * from src)z ON (x.value = z.value) @@ -827,7 +848,8 @@ SELECT x.key, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN (select key, value from src1 union select key, value from src union select key, value from src union select key, value from src)z ON (x.value = z.value) PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT x.key, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN (select * from src1 union select * from src)z ON (x.value = z.value) @@ -1268,12 +1290,14 @@ Stage-0 predicate:value is not null (type: boolean) TableScan [TS_2] alias:x -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN SELECT x.key, z.value, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=11) PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN SELECT x.key, z.value, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=11) @@ -1345,7 +1369,8 @@ Stage-0 TableScan [TS_3] alias:y Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN select ss.k1,sr.k2,cs.k3,count(ss.v1),count(sr.v2),count(cs.v3) FROM @@ -1373,7 +1398,8 @@ order by ss.k1,sr.k2,cs.k3 limit 100 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN select ss.k1,sr.k2,cs.k3,count(ss.v1),count(sr.v2),count(cs.v3) FROM @@ -1608,7 +1634,8 @@ Stage-0 TableScan [TS_23] alias:srcpart Statistics:Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT x.key, z.value, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN (select * from src1 union select * from src)z ON (x.value = z.value) @@ -1617,7 +1644,8 @@ SELECT x.key, z.value, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN (select * from src1 union select * from src)z ON (x.value = z.value) PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT x.key, z.value, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN (select * from src1 union select * from src)z ON (x.value = z.value) @@ -1821,7 +1849,8 @@ Stage-0 predicate:key is not null (type: boolean) TableScan [TS_27] alias:y -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT x.key, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN (select * from src1 union select * from src)z ON (x.value = z.value) @@ -1834,7 +1863,8 @@ SELECT x.key, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN (select key, value from src1 union select key, value from src union select key, value from src union select key, value from src)z ON (x.value = z.value) PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT x.key, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN (select * from src1 union select * from src)z ON (x.value = z.value) @@ -2299,12 +2329,14 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: query: insert overwrite table tab_part partition (ds='2008-04-08') +-- SORT_QUERY_RESULTS select key,value from srcbucket_mapjoin_part PREHOOK: type: QUERY PREHOOK: Input: default@srcbucket_mapjoin_part PREHOOK: Input: default@srcbucket_mapjoin_part@ds=2008-04-08 PREHOOK: Output: default@tab_part@ds=2008-04-08 POSTHOOK: query: insert overwrite table tab_part partition (ds='2008-04-08') +-- SORT_QUERY_RESULTS select key,value from srcbucket_mapjoin_part POSTHOOK: type: QUERY POSTHOOK: Input: default@srcbucket_mapjoin_part @@ -2312,21 +2344,25 @@ POSTHOOK: Input: default@srcbucket_mapjoin_part@ds=2008-04-08 POSTHOOK: Output: default@tab_part@ds=2008-04-08 POSTHOOK: Lineage: tab_part PARTITION(ds=2008-04-08).key SIMPLE [(srcbucket_mapjoin_part)srcbucket_mapjoin_part.FieldSchema(name:key, type:int, comment:null), ] POSTHOOK: Lineage: tab_part PARTITION(ds=2008-04-08).value SIMPLE [(srcbucket_mapjoin_part)srcbucket_mapjoin_part.FieldSchema(name:value, type:string, comment:null), ] -PREHOOK: query: CREATE TABLE tab(key int, value string) PARTITIONED BY(ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +PREHOOK: query: -- SORT_QUERY_RESULTS +CREATE TABLE tab(key int, value string) PARTITIONED BY(ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@tab -POSTHOOK: query: CREATE TABLE tab(key int, value string) PARTITIONED BY(ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +POSTHOOK: query: -- SORT_QUERY_RESULTS +CREATE TABLE tab(key int, value string) PARTITIONED BY(ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@tab -PREHOOK: query: insert overwrite table tab partition (ds='2008-04-08') +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table tab partition (ds='2008-04-08') select key,value from srcbucket_mapjoin PREHOOK: type: QUERY PREHOOK: Input: default@srcbucket_mapjoin PREHOOK: Input: default@srcbucket_mapjoin@ds=2008-04-08 PREHOOK: Output: default@tab@ds=2008-04-08 -POSTHOOK: query: insert overwrite table tab partition (ds='2008-04-08') +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table tab partition (ds='2008-04-08') select key,value from srcbucket_mapjoin POSTHOOK: type: QUERY POSTHOOK: Input: default@srcbucket_mapjoin @@ -2334,21 +2370,25 @@ POSTHOOK: Input: default@srcbucket_mapjoin@ds=2008-04-08 POSTHOOK: Output: default@tab@ds=2008-04-08 POSTHOOK: Lineage: tab PARTITION(ds=2008-04-08).key SIMPLE [(srcbucket_mapjoin)srcbucket_mapjoin.FieldSchema(name:key, type:int, comment:null), ] POSTHOOK: Lineage: tab PARTITION(ds=2008-04-08).value SIMPLE [(srcbucket_mapjoin)srcbucket_mapjoin.FieldSchema(name:value, type:string, comment:null), ] -PREHOOK: query: CREATE TABLE tab2(key int, value string) PARTITIONED BY(ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +PREHOOK: query: -- SORT_QUERY_RESULTS +CREATE TABLE tab2(key int, value string) PARTITIONED BY(ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@tab2 -POSTHOOK: query: CREATE TABLE tab2(key int, value string) PARTITIONED BY(ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +POSTHOOK: query: -- SORT_QUERY_RESULTS +CREATE TABLE tab2(key int, value string) PARTITIONED BY(ds STRING) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@tab2 -PREHOOK: query: insert overwrite table tab2 partition (ds='2008-04-08') +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table tab2 partition (ds='2008-04-08') select key,value from srcbucket_mapjoin PREHOOK: type: QUERY PREHOOK: Input: default@srcbucket_mapjoin PREHOOK: Input: default@srcbucket_mapjoin@ds=2008-04-08 PREHOOK: Output: default@tab2@ds=2008-04-08 -POSTHOOK: query: insert overwrite table tab2 partition (ds='2008-04-08') +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table tab2 partition (ds='2008-04-08') select key,value from srcbucket_mapjoin POSTHOOK: type: QUERY POSTHOOK: Input: default@srcbucket_mapjoin @@ -2356,10 +2396,12 @@ POSTHOOK: Input: default@srcbucket_mapjoin@ds=2008-04-08 POSTHOOK: Output: default@tab2@ds=2008-04-08 POSTHOOK: Lineage: tab2 PARTITION(ds=2008-04-08).key SIMPLE [(srcbucket_mapjoin)srcbucket_mapjoin.FieldSchema(name:key, type:int, comment:null), ] POSTHOOK: Lineage: tab2 PARTITION(ds=2008-04-08).value SIMPLE [(srcbucket_mapjoin)srcbucket_mapjoin.FieldSchema(name:value, type:string, comment:null), ] -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select s1.key as key, s1.value as value from tab s1 join tab s3 on s1.key=s3.key PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select s1.key as key, s1.value as value from tab s1 join tab s3 on s1.key=s3.key POSTHOOK: type: QUERY Plan not optimized by CBO due to missing statistics. Please check log for more details. @@ -2391,10 +2433,12 @@ Stage-0 TableScan [TS_0] alias:s1 Statistics:Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select s1.key as key, s1.value as value from tab s1 join tab s3 on s1.key=s3.key join tab s2 on s1.value=s2.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select s1.key as key, s1.value as value from tab s1 join tab s3 on s1.key=s3.key join tab s2 on s1.value=s2.value POSTHOOK: type: QUERY Plan not optimized by CBO due to missing statistics. Please check log for more details. @@ -2453,10 +2497,12 @@ Stage-0 TableScan [TS_2] alias:s2 Statistics:Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select s1.key as key, s1.value as value from tab s1 join tab2 s3 on s1.key=s3.key PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select s1.key as key, s1.value as value from tab s1 join tab2 s3 on s1.key=s3.key POSTHOOK: type: QUERY Plan not optimized by CBO due to missing statistics. Please check log for more details. @@ -2488,10 +2534,12 @@ Stage-0 TableScan [TS_0] alias:s1 Statistics:Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select s1.key as key, s1.value as value from tab s1 join tab2 s3 on s1.key=s3.key join tab2 s2 on s1.value=s2.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select s1.key as key, s1.value as value from tab s1 join tab2 s3 on s1.key=s3.key join tab2 s2 on s1.value=s2.value POSTHOOK: type: QUERY Plan not optimized by CBO due to missing statistics. Please check log for more details. @@ -2550,13 +2598,15 @@ Stage-0 TableScan [TS_2] alias:s2 Statistics:Num rows: 242 Data size: 2566 Basic stats: COMPLETE Column stats: NONE -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select count(*) from (select s1.key as key, s1.value as value from tab s1 join tab s3 on s1.key=s3.key UNION ALL select s2.key as key, s2.value as value from tab s2 ) a join tab_part b on (a.key = b.key) PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select count(*) from (select s1.key as key, s1.value as value from tab s1 join tab s3 on s1.key=s3.key UNION ALL select s2.key as key, s2.value as value from tab s2 @@ -2640,13 +2690,15 @@ Stage-0 predicate:key is not null (type: boolean) TableScan [TS_8] alias:s2 -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select count(*) from (select s1.key as key, s1.value as value from tab s1 join tab s3 on s1.key=s3.key join tab s2 on s1.value=s2.value UNION ALL select s2.key as key, s2.value as value from tab s2 ) a join tab_part b on (a.key = b.key) PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select count(*) from (select s1.key as key, s1.value as value from tab s1 join tab s3 on s1.key=s3.key join tab s2 on s1.value=s2.value UNION ALL select s2.key as key, s2.value as value from tab s2 @@ -2756,7 +2808,8 @@ Stage-0 predicate:key is not null (type: boolean) TableScan [TS_14] alias:s2 -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT x.key, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN (select * from src1 union all select * from src)z ON (x.value = z.value) @@ -2769,7 +2822,8 @@ SELECT x.key, y.value FROM src1 x JOIN src1 y ON (x.key = y.key) JOIN (select key, value from src1 union all select key, value from src union all select key, value from src union all select key, value from src)z ON (x.value = z.value) PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT x.key, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN (select * from src1 union all select * from src)z ON (x.value = z.value) @@ -3131,7 +3185,8 @@ Stage-0 predicate:value is not null (type: boolean) TableScan [TS_50] alias:y -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT x.key, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN (select * from src1 union select * from src)z ON (x.value = z.value) @@ -3144,7 +3199,8 @@ SELECT x.key, y.value FROM src1 x JOIN src1 y ON (x.key = y.key) JOIN (select key, value from src1 union select key, value from src union select key, value from src union select key, value from src)z ON (x.value = z.value) PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain SELECT x.key, y.value FROM src1 x JOIN src y ON (x.key = y.key) JOIN (select * from src1 union select * from src)z ON (x.value = z.value) @@ -3585,7 +3641,8 @@ POSTHOOK: query: CREATE TABLE c(key STRING, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@c -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain from ( SELECT x.key, y.value @@ -3604,7 +3661,8 @@ INSERT OVERWRITE TABLE a SELECT tmp.key, tmp.value INSERT OVERWRITE TABLE b SELECT tmp.key, tmp.value INSERT OVERWRITE TABLE c SELECT tmp.key, tmp.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain from ( SELECT x.key, y.value @@ -3975,7 +4033,8 @@ Stage-5 Move Operator table:{"serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe","name:":"default.a","input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat"} Please refer to the previous Stage-4 -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain FROM ( SELECT x.key as key, y.value as value from src1 x JOIN src y ON (x.key = y.key) @@ -3991,7 +4050,8 @@ INSERT OVERWRITE TABLE a SELECT tmp.key, tmp.value INSERT OVERWRITE TABLE b SELECT tmp.key, tmp.value INSERT OVERWRITE TABLE c SELECT tmp.key, tmp.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain FROM ( SELECT x.key as key, y.value as value from src1 x JOIN src y ON (x.key = y.key) @@ -4606,13 +4666,15 @@ Stage-0 TableScan [TS_2] alias:c Statistics:Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column stats: NONE -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN SELECT TRANSFORM(a.key, a.value) USING 'cat' AS (tkey, tvalue) FROM src a join src b on a.key = b.key PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN SELECT TRANSFORM(a.key, a.value) USING 'cat' AS (tkey, tvalue) FROM src a join src b @@ -4666,7 +4728,8 @@ Stage-0 TableScan [TS_1] alias:b Statistics:Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain FROM ( select key, value from ( select 'tst1' as key, cast(count(1) as string) as value, 'tst1' as value2 from src s1 @@ -4679,7 +4742,8 @@ INSERT OVERWRITE TABLE DEST1 SELECT unionsrc.key, COUNT(DISTINCT SUBSTR(unionsrc INSERT OVERWRITE TABLE DEST2 SELECT unionsrc.key, unionsrc.value, COUNT(DISTINCT SUBSTR(unionsrc.value,5)) GROUP BY unionsrc.key, unionsrc.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain FROM ( select key, value from ( select 'tst1' as key, cast(count(1) as string) as value, 'tst1' as value2 from src s1 @@ -4822,7 +4886,8 @@ Stage-4 Move Operator table:{"serde:":"org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe","name:":"default.dest1","input format:":"org.apache.hadoop.mapred.TextInputFormat","output format:":"org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat"} Please refer to the previous Stage-3 -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain FROM ( select 'tst1' as key, cast(count(1) as string) as value, 'tst1' as value2 from src s1 UNION all @@ -4832,7 +4897,8 @@ INSERT OVERWRITE TABLE DEST1 SELECT unionsrc.key, COUNT(DISTINCT SUBSTR(unionsrc INSERT OVERWRITE TABLE DEST2 SELECT unionsrc.key, unionsrc.value, COUNT(DISTINCT SUBSTR(unionsrc.value,5)) GROUP BY unionsrc.key, unionsrc.value PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain FROM ( select 'tst1' as key, cast(count(1) as string) as value, 'tst1' as value2 from src s1 UNION all diff --git a/ql/src/test/results/clientpositive/tez/filter_join_breaktask2.q.out b/ql/src/test/results/clientpositive/tez/filter_join_breaktask2.q.out index 6a2396e..8e0d0f6 100644 --- a/ql/src/test/results/clientpositive/tez/filter_join_breaktask2.q.out +++ b/ql/src/test/results/clientpositive/tez/filter_join_breaktask2.q.out @@ -1,42 +1,52 @@ -PREHOOK: query: create table T1(c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string) +PREHOOK: query: -- SORT_QUERY_RESULTS +create table T1(c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string) partitioned by (ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@T1 -POSTHOOK: query: create table T1(c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string) +POSTHOOK: query: -- SORT_QUERY_RESULTS +create table T1(c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@T1 -PREHOOK: query: create table T2(c1 string, c2 string, c3 string, c0 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string) partitioned by (ds string) +PREHOOK: query: -- SORT_QUERY_RESULTS +create table T2(c1 string, c2 string, c3 string, c0 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string) partitioned by (ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@T2 -POSTHOOK: query: create table T2(c1 string, c2 string, c3 string, c0 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string) partitioned by (ds string) +POSTHOOK: query: -- SORT_QUERY_RESULTS +create table T2(c1 string, c2 string, c3 string, c0 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@T2 -PREHOOK: query: create table T3 (c0 bigint, c1 bigint, c2 int) partitioned by (ds string) +PREHOOK: query: -- SORT_QUERY_RESULTS +create table T3 (c0 bigint, c1 bigint, c2 int) partitioned by (ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@T3 -POSTHOOK: query: create table T3 (c0 bigint, c1 bigint, c2 int) partitioned by (ds string) +POSTHOOK: query: -- SORT_QUERY_RESULTS +create table T3 (c0 bigint, c1 bigint, c2 int) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@T3 -PREHOOK: query: create table T4 (c0 bigint, c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string, c26 string, c27 string, c28 string, c29 string, c30 string, c31 string, c32 string, c33 string, c34 string, c35 string, c36 string, c37 string, c38 string, c39 string, c40 string, c41 string, c42 string, c43 string, c44 string, c45 string, c46 string, c47 string, c48 string, c49 string, c50 string, c51 string, c52 string, c53 string, c54 string, c55 string, c56 string, c57 string, c58 string, c59 string, c60 string, c61 string, c62 string, c63 string, c64 string, c65 string, c66 string, c67 bigint, c68 string, c69 string, c70 bigint, c71 bigint, c72 bigint, c73 string, c74 string, c75 string, c76 string, c77 string, c78 string, c79 string, c80 string, c81 bigint, c82 bigint, c83 bigint) partitioned by (ds string) +PREHOOK: query: -- SORT_QUERY_RESULTS +create table T4 (c0 bigint, c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string, c26 string, c27 string, c28 string, c29 string, c30 string, c31 string, c32 string, c33 string, c34 string, c35 string, c36 string, c37 string, c38 string, c39 string, c40 string, c41 string, c42 string, c43 string, c44 string, c45 string, c46 string, c47 string, c48 string, c49 string, c50 string, c51 string, c52 string, c53 string, c54 string, c55 string, c56 string, c57 string, c58 string, c59 string, c60 string, c61 string, c62 string, c63 string, c64 string, c65 string, c66 string, c67 bigint, c68 string, c69 string, c70 bigint, c71 bigint, c72 bigint, c73 string, c74 string, c75 string, c76 string, c77 string, c78 string, c79 string, c80 string, c81 bigint, c82 bigint, c83 bigint) partitioned by (ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@T4 -POSTHOOK: query: create table T4 (c0 bigint, c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string, c26 string, c27 string, c28 string, c29 string, c30 string, c31 string, c32 string, c33 string, c34 string, c35 string, c36 string, c37 string, c38 string, c39 string, c40 string, c41 string, c42 string, c43 string, c44 string, c45 string, c46 string, c47 string, c48 string, c49 string, c50 string, c51 string, c52 string, c53 string, c54 string, c55 string, c56 string, c57 string, c58 string, c59 string, c60 string, c61 string, c62 string, c63 string, c64 string, c65 string, c66 string, c67 bigint, c68 string, c69 string, c70 bigint, c71 bigint, c72 bigint, c73 string, c74 string, c75 string, c76 string, c77 string, c78 string, c79 string, c80 string, c81 bigint, c82 bigint, c83 bigint) partitioned by (ds string) +POSTHOOK: query: -- SORT_QUERY_RESULTS +create table T4 (c0 bigint, c1 string, c2 string, c3 string, c4 string, c5 string, c6 string, c7 string, c8 string, c9 string, c10 string, c11 string, c12 string, c13 string, c14 string, c15 string, c16 string, c17 string, c18 string, c19 string, c20 string, c21 string, c22 string, c23 string, c24 string, c25 string, c26 string, c27 string, c28 string, c29 string, c30 string, c31 string, c32 string, c33 string, c34 string, c35 string, c36 string, c37 string, c38 string, c39 string, c40 string, c41 string, c42 string, c43 string, c44 string, c45 string, c46 string, c47 string, c48 string, c49 string, c50 string, c51 string, c52 string, c53 string, c54 string, c55 string, c56 string, c57 string, c58 string, c59 string, c60 string, c61 string, c62 string, c63 string, c64 string, c65 string, c66 string, c67 bigint, c68 string, c69 string, c70 bigint, c71 bigint, c72 bigint, c73 string, c74 string, c75 string, c76 string, c77 string, c78 string, c79 string, c80 string, c81 bigint, c82 bigint, c83 bigint) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@T4 -PREHOOK: query: insert overwrite table T1 partition (ds='2010-04-17') select '5', '1', '1', '1', 0, 0,4 from src tablesample (1 rows) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T1 partition (ds='2010-04-17') select '5', '1', '1', '1', 0, 0,4 from src tablesample (1 rows) PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@t1@ds=2010-04-17 -POSTHOOK: query: insert overwrite table T1 partition (ds='2010-04-17') select '5', '1', '1', '1', 0, 0,4 from src tablesample (1 rows) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T1 partition (ds='2010-04-17') select '5', '1', '1', '1', 0, 0,4 from src tablesample (1 rows) POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@t1@ds=2010-04-17 @@ -47,11 +57,13 @@ POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c4 SIMPLE [] POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c5 SIMPLE [] POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c6 SIMPLE [] POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c7 SIMPLE [] -PREHOOK: query: insert overwrite table T2 partition(ds='2010-04-17') select '5','name', NULL, '2', 'kavin',NULL, '9', 'c', '8', '0', '0', '7', '1','2', '0', '3','2', NULL, '1', NULL, '3','2','0','0','5','10' from src tablesample (1 rows) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T2 partition(ds='2010-04-17') select '5','name', NULL, '2', 'kavin',NULL, '9', 'c', '8', '0', '0', '7', '1','2', '0', '3','2', NULL, '1', NULL, '3','2','0','0','5','10' from src tablesample (1 rows) PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@t2@ds=2010-04-17 -POSTHOOK: query: insert overwrite table T2 partition(ds='2010-04-17') select '5','name', NULL, '2', 'kavin',NULL, '9', 'c', '8', '0', '0', '7', '1','2', '0', '3','2', NULL, '1', NULL, '3','2','0','0','5','10' from src tablesample (1 rows) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T2 partition(ds='2010-04-17') select '5','name', NULL, '2', 'kavin',NULL, '9', 'c', '8', '0', '0', '7', '1','2', '0', '3','2', NULL, '1', NULL, '3','2','0','0','5','10' from src tablesample (1 rows) POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@t2@ds=2010-04-17 @@ -81,23 +93,27 @@ POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c6 SIMPLE [] POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c7 SIMPLE [] POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c8 SIMPLE [] POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c9 SIMPLE [] -PREHOOK: query: insert overwrite table T3 partition (ds='2010-04-17') select 4,5,0 from src tablesample (1 rows) +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T3 partition (ds='2010-04-17') select 4,5,0 from src tablesample (1 rows) PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@t3@ds=2010-04-17 -POSTHOOK: query: insert overwrite table T3 partition (ds='2010-04-17') select 4,5,0 from src tablesample (1 rows) +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T3 partition (ds='2010-04-17') select 4,5,0 from src tablesample (1 rows) POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@t3@ds=2010-04-17 POSTHOOK: Lineage: t3 PARTITION(ds=2010-04-17).c0 EXPRESSION [] POSTHOOK: Lineage: t3 PARTITION(ds=2010-04-17).c1 EXPRESSION [] POSTHOOK: Lineage: t3 PARTITION(ds=2010-04-17).c2 SIMPLE [] -PREHOOK: query: insert overwrite table T4 partition(ds='2010-04-17') +PREHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T4 partition(ds='2010-04-17') select 4,'1','1','8','4','5','1','0','9','U','2','2', '0','2','1','1','J','C','A','U', '2','s', '2',NULL, NULL, NULL,NULL, NULL, NULL,'1','j', 'S', '6',NULL,'1', '2', 'J', 'g', '1', 'e', '2', '1', '2', 'U', 'P', 'p', '3', '0', '0', '0', '1', '1', '1', '0', '0', '0', '6', '2', 'j',NULL, NULL, NULL,NULL,NULL, NULL, '5',NULL, 'j', 'j', 2, 2, 1, '2', '2', '1', '1', '1', '1', '1', '1', 1, 1, 32,NULL from src limit 1 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@t4@ds=2010-04-17 -POSTHOOK: query: insert overwrite table T4 partition(ds='2010-04-17') +POSTHOOK: query: -- SORT_QUERY_RESULTS +insert overwrite table T4 partition(ds='2010-04-17') select 4,'1','1','8','4','5','1','0','9','U','2','2', '0','2','1','1','J','C','A','U', '2','s', '2',NULL, NULL, NULL,NULL, NULL, NULL,'1','j', 'S', '6',NULL,'1', '2', 'J', 'g', '1', 'e', '2', '1', '2', 'U', 'P', 'p', '3', '0', '0', '0', '1', '1', '1', '0', '0', '0', '6', '2', 'j',NULL, NULL, NULL,NULL,NULL, NULL, '5',NULL, 'j', 'j', 2, 2, 1, '2', '2', '1', '1', '1', '1', '1', '1', 1, 1, 32,NULL from src limit 1 POSTHOOK: type: QUERY POSTHOOK: Input: default@src @@ -186,52 +202,61 @@ POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c81 EXPRESSION [] POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c82 EXPRESSION [] POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c83 EXPRESSION [] POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c9 SIMPLE [] -PREHOOK: query: select * from T2 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from T2 PREHOOK: type: QUERY PREHOOK: Input: default@t2 PREHOOK: Input: default@t2@ds=2010-04-17 #### A masked pattern was here #### -POSTHOOK: query: select * from T2 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from T2 POSTHOOK: type: QUERY POSTHOOK: Input: default@t2 POSTHOOK: Input: default@t2@ds=2010-04-17 #### A masked pattern was here #### 5 name NULL 2 kavin NULL 9 c 8 0 0 7 1 2 0 3 2 NULL 1 NULL 3 2 0 0 5 10 2010-04-17 -PREHOOK: query: select * from T1 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from T1 PREHOOK: type: QUERY PREHOOK: Input: default@t1 PREHOOK: Input: default@t1@ds=2010-04-17 #### A masked pattern was here #### -POSTHOOK: query: select * from T1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from T1 POSTHOOK: type: QUERY POSTHOOK: Input: default@t1 POSTHOOK: Input: default@t1@ds=2010-04-17 #### A masked pattern was here #### 5 1 1 1 0 0 4 2010-04-17 -PREHOOK: query: select * from T3 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from T3 PREHOOK: type: QUERY PREHOOK: Input: default@t3 PREHOOK: Input: default@t3@ds=2010-04-17 #### A masked pattern was here #### -POSTHOOK: query: select * from T3 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from T3 POSTHOOK: type: QUERY POSTHOOK: Input: default@t3 POSTHOOK: Input: default@t3@ds=2010-04-17 #### A masked pattern was here #### 4 5 0 2010-04-17 -PREHOOK: query: select * from T4 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from T4 PREHOOK: type: QUERY PREHOOK: Input: default@t4 PREHOOK: Input: default@t4@ds=2010-04-17 #### A masked pattern was here #### -POSTHOOK: query: select * from T4 +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from T4 POSTHOOK: type: QUERY POSTHOOK: Input: default@t4 POSTHOOK: Input: default@t4@ds=2010-04-17 #### A masked pattern was here #### 4 1 1 8 4 5 1 0 9 U 2 2 0 2 1 1 J C A U 2 s 2 NULL NULL NULL NULL NULL NULL 1 j S 6 NULL 1 2 J g 1 e 2 1 2 U P p 3 0 0 0 1 1 1 0 0 0 6 2 j NULL NULL NULL NULL NULL NULL 5 NULL NULL j 2 2 1 2 2 1 1 1 1 1 1 1 1 32 NULL 2010-04-17 WARNING: Comparing a bigint and a string may result in a loss of precision. -PREHOOK: query: SELECT a.c1 as a_c1, b.c1 b_c1, d.c0 as d_c0 +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT a.c1 as a_c1, b.c1 b_c1, d.c0 as d_c0 FROM T1 a JOIN T2 b ON (a.c1 = b.c1 AND a.ds='2010-04-17' AND b.ds='2010-04-17') JOIN T3 c @@ -248,7 +273,8 @@ PREHOOK: Input: default@t3@ds=2010-04-17 PREHOOK: Input: default@t4 PREHOOK: Input: default@t4@ds=2010-04-17 #### A masked pattern was here #### -POSTHOOK: query: SELECT a.c1 as a_c1, b.c1 b_c1, d.c0 as d_c0 +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT a.c1 as a_c1, b.c1 b_c1, d.c0 as d_c0 FROM T1 a JOIN T2 b ON (a.c1 = b.c1 AND a.ds='2010-04-17' AND b.ds='2010-04-17') JOIN T3 c diff --git a/ql/src/test/results/clientpositive/tez/insert_into1.q.out b/ql/src/test/results/clientpositive/tez/insert_into1.q.out index 359470b..fe920bc 100644 --- a/ql/src/test/results/clientpositive/tez/insert_into1.q.out +++ b/ql/src/test/results/clientpositive/tez/insert_into1.q.out @@ -10,9 +10,11 @@ POSTHOOK: query: CREATE TABLE insert_into1 (key int, value string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@insert_into1 -PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * from src LIMIT 100 +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN INSERT INTO TABLE insert_into1 SELECT * from src ORDER BY key LIMIT 100 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * from src LIMIT 100 +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN INSERT INTO TABLE insert_into1 SELECT * from src ORDER BY key LIMIT 100 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -36,19 +38,17 @@ STAGE PLANS: expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE - Limit - Number of rows: 100 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - sort order: - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: string), _col1 (type: string) + Reduce Output Operator + key expressions: _col0 (type: string) + sort order: + + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: string) Reducer 2 Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: string), VALUE._col1 (type: string) + expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 100 Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE @@ -81,11 +81,11 @@ STAGE PLANS: Stage: Stage-3 Stats-Aggr Operator -PREHOOK: query: INSERT INTO TABLE insert_into1 SELECT * from src LIMIT 100 +PREHOOK: query: INSERT INTO TABLE insert_into1 SELECT * from src ORDER BY key LIMIT 100 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@insert_into1 -POSTHOOK: query: INSERT INTO TABLE insert_into1 SELECT * from src LIMIT 100 +POSTHOOK: query: INSERT INTO TABLE insert_into1 SELECT * from src ORDER BY key LIMIT 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@insert_into1 @@ -103,7 +103,7 @@ POSTHOOK: query: SELECT SUM(HASH(c)) FROM ( POSTHOOK: type: QUERY POSTHOOK: Input: default@insert_into1 #### A masked pattern was here #### -10226524244 +-1142373758 PREHOOK: query: explain select count(*) from insert_into1 PREHOOK: type: QUERY @@ -129,9 +129,9 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@insert_into1 #### A masked pattern was here #### 100 -PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src LIMIT 100 +PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 100 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src LIMIT 100 +POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 100 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -155,19 +155,17 @@ STAGE PLANS: expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE - Limit - Number of rows: 100 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - sort order: - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: string), _col1 (type: string) + Reduce Output Operator + key expressions: _col0 (type: string) + sort order: + + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: string) Reducer 2 Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: string), VALUE._col1 (type: string) + expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 100 Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE @@ -200,11 +198,11 @@ STAGE PLANS: Stage: Stage-3 Stats-Aggr Operator -PREHOOK: query: INSERT INTO TABLE insert_into1 SELECT * FROM src LIMIT 100 +PREHOOK: query: INSERT INTO TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 100 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@insert_into1 -POSTHOOK: query: INSERT INTO TABLE insert_into1 SELECT * FROM src LIMIT 100 +POSTHOOK: query: INSERT INTO TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@insert_into1 @@ -222,7 +220,7 @@ POSTHOOK: query: SELECT SUM(HASH(c)) FROM ( POSTHOOK: type: QUERY POSTHOOK: Input: default@insert_into1 #### A masked pattern was here #### -20453048488 +-2284747516 PREHOOK: query: explain SELECT COUNT(*) FROM insert_into1 PREHOOK: type: QUERY @@ -248,9 +246,9 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@insert_into1 #### A masked pattern was here #### 200 -PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src LIMIT 10 +PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 10 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src LIMIT 10 +POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 10 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -274,19 +272,17 @@ STAGE PLANS: expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE - Limit - Number of rows: 10 - Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - sort order: - Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: string), _col1 (type: string) + Reduce Output Operator + key expressions: _col0 (type: string) + sort order: + + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: string) Reducer 2 Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: string), VALUE._col1 (type: string) + expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 10 Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE Column stats: NONE @@ -319,11 +315,11 @@ STAGE PLANS: Stage: Stage-3 Stats-Aggr Operator -PREHOOK: query: INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src LIMIT 10 +PREHOOK: query: INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 10 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@insert_into1 -POSTHOOK: query: INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src LIMIT 10 +POSTHOOK: query: INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src ORDER BY key LIMIT 10 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@insert_into1 @@ -341,7 +337,7 @@ POSTHOOK: query: SELECT SUM(HASH(c)) FROM ( POSTHOOK: type: QUERY POSTHOOK: Input: default@insert_into1 #### A masked pattern was here #### --826625916 +-2693537120 PREHOOK: query: explain SELECT COUNT(*) FROM insert_into1 PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/tez/insert_into2.q.out b/ql/src/test/results/clientpositive/tez/insert_into2.q.out index 6bfa257..2c7ec63 100644 --- a/ql/src/test/results/clientpositive/tez/insert_into2.q.out +++ b/ql/src/test/results/clientpositive/tez/insert_into2.q.out @@ -13,10 +13,10 @@ POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@insert_into2 PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into2 PARTITION (ds='1') - SELECT * FROM src LIMIT 100 + SELECT * FROM src order by key LIMIT 100 PREHOOK: type: QUERY POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into2 PARTITION (ds='1') - SELECT * FROM src LIMIT 100 + SELECT * FROM src order by key LIMIT 100 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -40,19 +40,17 @@ STAGE PLANS: expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE - Limit - Number of rows: 100 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - sort order: - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: string), _col1 (type: string) + Reduce Output Operator + key expressions: _col0 (type: string) + sort order: + + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: string) Reducer 2 Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: string), VALUE._col1 (type: string) + expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 100 Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE @@ -87,11 +85,11 @@ STAGE PLANS: Stage: Stage-3 Stats-Aggr Operator -PREHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src limit 100 +PREHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src order by key limit 100 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@insert_into2@ds=1 -POSTHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src limit 100 +POSTHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src order by key limit 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@insert_into2@ds=1 @@ -122,11 +120,11 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@insert_into2 #### A masked pattern was here #### 100 -PREHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src limit 100 +PREHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src order by key limit 100 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@insert_into2@ds=1 -POSTHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src limit 100 +POSTHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src order by key limit 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@insert_into2@ds=1 @@ -171,12 +169,12 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@insert_into2 POSTHOOK: Input: default@insert_into2@ds=1 #### A masked pattern was here #### --24159954504 +-39568181484 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 100 + SELECT * FROM src order by key LIMIT 100 PREHOOK: type: QUERY POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 100 + SELECT * FROM src order by key LIMIT 100 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -200,19 +198,17 @@ STAGE PLANS: expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE - Limit - Number of rows: 100 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - sort order: - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: string), _col1 (type: string) + Reduce Output Operator + key expressions: _col0 (type: string) + sort order: + + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: string) Reducer 2 Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: string), VALUE._col1 (type: string) + expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 100 Statistics: Num rows: 100 Data size: 1000 Basic stats: COMPLETE Column stats: NONE @@ -248,12 +244,12 @@ STAGE PLANS: Stats-Aggr Operator PREHOOK: query: INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 100 + SELECT * FROM src order by key LIMIT 100 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@insert_into2@ds=2 POSTHOOK: query: INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 100 + SELECT * FROM src order by key LIMIT 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@insert_into2@ds=2 @@ -275,7 +271,7 @@ POSTHOOK: Input: default@insert_into2 POSTHOOK: Input: default@insert_into2@ds=1 POSTHOOK: Input: default@insert_into2@ds=2 #### A masked pattern was here #### --36239931656 +-59352272126 PREHOOK: query: explain SELECT COUNT(*) FROM insert_into2 WHERE ds='2' PREHOOK: type: QUERY @@ -302,10 +298,10 @@ POSTHOOK: Input: default@insert_into2 #### A masked pattern was here #### 100 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 50 + SELECT * FROM src order by key LIMIT 50 PREHOOK: type: QUERY POSTHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 50 + SELECT * FROM src order by key LIMIT 50 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -329,19 +325,17 @@ STAGE PLANS: expressions: key (type: string), value (type: string) outputColumnNames: _col0, _col1 Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE - Limit - Number of rows: 50 - Statistics: Num rows: 50 Data size: 500 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - sort order: - Statistics: Num rows: 50 Data size: 500 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: string), _col1 (type: string) + Reduce Output Operator + key expressions: _col0 (type: string) + sort order: + + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: string) Reducer 2 Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: string), VALUE._col1 (type: string) + expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 50 Data size: 500 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 50 Statistics: Num rows: 50 Data size: 500 Basic stats: COMPLETE Column stats: NONE @@ -377,12 +371,12 @@ STAGE PLANS: Stats-Aggr Operator PREHOOK: query: INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 50 + SELECT * FROM src order by key LIMIT 50 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@insert_into2@ds=2 POSTHOOK: query: INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2') - SELECT * FROM src LIMIT 50 + SELECT * FROM src order by key LIMIT 50 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@insert_into2@ds=2 @@ -404,7 +398,7 @@ POSTHOOK: Input: default@insert_into2 POSTHOOK: Input: default@insert_into2@ds=1 POSTHOOK: Input: default@insert_into2@ds=2 #### A masked pattern was here #### --27100860056 +-33609711132 PREHOOK: query: explain SELECT COUNT(*) FROM insert_into2 WHERE ds='2' PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/tez/join1.q.out b/ql/src/test/results/clientpositive/tez/join1.q.out index c5bd100..f3f27ca 100644 --- a/ql/src/test/results/clientpositive/tez/join1.q.out +++ b/ql/src/test/results/clientpositive/tez/join1.q.out @@ -10,11 +10,13 @@ CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j1 -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value POSTHOOK: type: QUERY @@ -105,23 +107,27 @@ STAGE PLANS: Stage: Stage-3 Stats-Aggr Operator -PREHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key) +PREHOOK: query: -- SORT_QUERY_RESULTS +FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@dest_j1 -POSTHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key) +POSTHOOK: query: -- SORT_QUERY_RESULTS +FROM src src1 JOIN src src2 ON (src1.key = src2.key) INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@dest_j1 POSTHOOK: Lineage: dest_j1.key EXPRESSION [(src)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: dest_j1.value SIMPLE [(src)src1.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: SELECT dest_j1.* FROM dest_j1 +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT dest_j1.* FROM dest_j1 PREHOOK: type: QUERY PREHOOK: Input: default@dest_j1 #### A masked pattern was here #### -POSTHOOK: query: SELECT dest_j1.* FROM dest_j1 +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT dest_j1.* FROM dest_j1 POSTHOOK: type: QUERY POSTHOOK: Input: default@dest_j1 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out b/ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out index e9766db..7ca537d 100644 --- a/ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out +++ b/ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out @@ -77,10 +77,10 @@ POSTHOOK: Input: default@over1k POSTHOOK: Output: default@t2 POSTHOOK: Lineage: t2.dec EXPRESSION [(over1k)over1k.FieldSchema(name:dec, type:decimal(4,2), comment:null), ] PREHOOK: query: 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 PREHOOK: type: QUERY POSTHOOK: query: 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 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -90,7 +90,8 @@ STAGE PLANS: Stage: Stage-1 Tez Edges: - Map 1 <- Map 2 (BROADCAST_EDGE) + Map 1 <- Map 3 (BROADCAST_EDGE) + Reducer 2 <- Map 1 (SIMPLE_EDGE) #### A masked pattern was here #### Vertices: Map 1 @@ -109,21 +110,19 @@ STAGE PLANS: 1 dec (type: decimal(6,2)) outputColumnNames: _col0, _col4 input vertices: - 1 Map 2 + 1 Map 3 Statistics: Num rows: 577 Data size: 64680 Basic stats: COMPLETE Column stats: NONE HybridGraceHashJoin: true Select Operator expressions: _col0 (type: decimal(4,2)), _col4 (type: decimal(4,0)) outputColumnNames: _col0, _col1 Statistics: Num rows: 577 Data size: 64680 Basic stats: COMPLETE Column stats: NONE - File Output Operator - compressed: false + Reduce Output Operator + key expressions: _col0 (type: decimal(4,2)) + sort order: + Statistics: Num rows: 577 Data size: 64680 Basic stats: COMPLETE Column stats: NONE - table: - input format: org.apache.hadoop.mapred.TextInputFormat - output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe - Map 2 + value expressions: _col1 (type: decimal(4,0)) + Map 3 Map Operator Tree: TableScan alias: t2 @@ -137,6 +136,19 @@ STAGE PLANS: Map-reduce partition columns: dec (type: decimal(6,2)) Statistics: Num rows: 525 Data size: 58800 Basic stats: COMPLETE Column stats: NONE value expressions: dec (type: decimal(4,0)) + Reducer 2 + Reduce Operator Tree: + Select Operator + expressions: KEY.reducesinkkey0 (type: decimal(4,2)), VALUE._col0 (type: decimal(4,0)) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 577 Data size: 64680 Basic stats: COMPLETE Column stats: NONE + File Output Operator + compressed: false + Statistics: Num rows: 577 Data size: 64680 Basic stats: COMPLETE Column stats: NONE + table: + input format: org.apache.hadoop.mapred.TextInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Stage: Stage-0 Fetch Operator @@ -144,12 +156,12 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) +PREHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec PREHOOK: type: QUERY PREHOOK: Input: default@t1 PREHOOK: Input: default@t2 #### A masked pattern was here #### -POSTHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) +POSTHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec POSTHOOK: type: QUERY POSTHOOK: Input: default@t1 POSTHOOK: Input: default@t2 @@ -260,12 +272,12 @@ POSTHOOK: Input: default@t2 9 9 9 9 9 9 -PREHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) +PREHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec PREHOOK: type: QUERY PREHOOK: Input: default@t1 PREHOOK: Input: default@t2 #### A masked pattern was here #### -POSTHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) +POSTHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec POSTHOOK: type: QUERY POSTHOOK: Input: default@t1 POSTHOOK: Input: default@t2 diff --git a/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out b/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out index f2610de..1bf760c 100644 --- a/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out @@ -470,10 +470,12 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -573,10 +575,12 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -701,7 +705,8 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' +PREHOOK: query: -- SORT_QUERY_RESULTS +select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@src1 @@ -711,7 +716,8 @@ PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### -POSTHOOK: query: select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' +POSTHOOK: query: -- SORT_QUERY_RESULTS +select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@src1 @@ -741,7 +747,8 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 98 98 98 -PREHOOK: query: select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds +PREHOOK: query: -- SORT_QUERY_RESULTS +select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@srcpart @@ -750,7 +757,8 @@ PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### -POSTHOOK: query: select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds +POSTHOOK: query: -- SORT_QUERY_RESULTS +select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@srcpart @@ -761,7 +769,8 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### 5308 5308 -PREHOOK: query: select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' +PREHOOK: query: -- SORT_QUERY_RESULTS +select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@src1 @@ -771,7 +780,8 @@ PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### -POSTHOOK: query: select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' +POSTHOOK: query: -- SORT_QUERY_RESULTS +select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) where srcpart.value > 'val_450' POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@src1 @@ -801,7 +811,8 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 98 98 98 -PREHOOK: query: select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds +PREHOOK: query: -- SORT_QUERY_RESULTS +select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@srcpart @@ -810,7 +821,8 @@ PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### -POSTHOOK: query: select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds +POSTHOOK: query: -- SORT_QUERY_RESULTS +select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@srcpart diff --git a/ql/src/test/results/clientpositive/tez/mergejoin.q.out b/ql/src/test/results/clientpositive/tez/mergejoin.q.out index 48cd2a1..89c0455 100644 --- a/ql/src/test/results/clientpositive/tez/mergejoin.q.out +++ b/ql/src/test/results/clientpositive/tez/mergejoin.q.out @@ -1,7 +1,9 @@ -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select * from src a join src1 b on a.key = b.key PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select * from src a join src1 b on a.key = b.key POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -77,12 +79,14 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select * from src a join src1 b on a.key = b.key +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from src a join src1 b on a.key = b.key PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@src1 #### A masked pattern was here #### -POSTHOOK: query: select * from src a join src1 b on a.key = b.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from src a join src1 b on a.key = b.key POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@src1 @@ -234,11 +238,13 @@ POSTHOOK: Input: default@srcbucket_mapjoin@ds=2008-04-08 POSTHOOK: Output: default@tab@ds=2008-04-08 POSTHOOK: Lineage: tab PARTITION(ds=2008-04-08).key SIMPLE [(srcbucket_mapjoin)srcbucket_mapjoin.FieldSchema(name:key, type:int, comment:null), ] POSTHOOK: Lineage: tab PARTITION(ds=2008-04-08).value SIMPLE [(srcbucket_mapjoin)srcbucket_mapjoin.FieldSchema(name:value, type:string, comment:null), ] -PREHOOK: query: explain +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select count(*) from tab a join tab_part b on a.key = b.key PREHOOK: type: QUERY -POSTHOOK: query: explain +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select count(*) from tab a join tab_part b on a.key = b.key POSTHOOK: type: QUERY @@ -324,14 +330,16 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select * from tab a join tab_part b on a.key = b.key +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from tab a join tab_part b on a.key = b.key PREHOOK: type: QUERY PREHOOK: Input: default@tab PREHOOK: Input: default@tab@ds=2008-04-08 PREHOOK: Input: default@tab_part PREHOOK: Input: default@tab_part@ds=2008-04-08 #### A masked pattern was here #### -POSTHOOK: query: select * from tab a join tab_part b on a.key = b.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from tab a join tab_part b on a.key = b.key POSTHOOK: type: QUERY POSTHOOK: Input: default@tab POSTHOOK: Input: default@tab@ds=2008-04-08 @@ -347,74 +355,12 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 0 val_0 2008-04-08 0 val_0 2008-04-08 0 val_0 2008-04-08 0 val_0 2008-04-08 0 val_0 2008-04-08 0 val_0 2008-04-08 -2 val_2 2008-04-08 2 val_2 2008-04-08 -4 val_4 2008-04-08 4 val_4 2008-04-08 -8 val_8 2008-04-08 8 val_8 2008-04-08 -11 val_11 2008-04-08 11 val_11 2008-04-08 -15 val_15 2008-04-08 15 val_15 2008-04-08 -15 val_15 2008-04-08 15 val_15 2008-04-08 -15 val_15 2008-04-08 15 val_15 2008-04-08 -15 val_15 2008-04-08 15 val_15 2008-04-08 -17 val_17 2008-04-08 17 val_17 2008-04-08 -19 val_19 2008-04-08 19 val_19 2008-04-08 -20 val_20 2008-04-08 20 val_20 2008-04-08 -24 val_24 2008-04-08 24 val_24 2008-04-08 -24 val_24 2008-04-08 24 val_24 2008-04-08 -24 val_24 2008-04-08 24 val_24 2008-04-08 -24 val_24 2008-04-08 24 val_24 2008-04-08 -26 val_26 2008-04-08 26 val_26 2008-04-08 -26 val_26 2008-04-08 26 val_26 2008-04-08 -26 val_26 2008-04-08 26 val_26 2008-04-08 -26 val_26 2008-04-08 26 val_26 2008-04-08 -28 val_28 2008-04-08 28 val_28 2008-04-08 -33 val_33 2008-04-08 33 val_33 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -37 val_37 2008-04-08 37 val_37 2008-04-08 -37 val_37 2008-04-08 37 val_37 2008-04-08 -37 val_37 2008-04-08 37 val_37 2008-04-08 -37 val_37 2008-04-08 37 val_37 2008-04-08 -42 val_42 2008-04-08 42 val_42 2008-04-08 -42 val_42 2008-04-08 42 val_42 2008-04-08 -42 val_42 2008-04-08 42 val_42 2008-04-08 -42 val_42 2008-04-08 42 val_42 2008-04-08 -44 val_44 2008-04-08 44 val_44 2008-04-08 -51 val_51 2008-04-08 51 val_51 2008-04-08 -51 val_51 2008-04-08 51 val_51 2008-04-08 -51 val_51 2008-04-08 51 val_51 2008-04-08 -51 val_51 2008-04-08 51 val_51 2008-04-08 -53 val_53 2008-04-08 53 val_53 2008-04-08 -57 val_57 2008-04-08 57 val_57 2008-04-08 -64 val_64 2008-04-08 64 val_64 2008-04-08 -66 val_66 2008-04-08 66 val_66 2008-04-08 -77 val_77 2008-04-08 77 val_77 2008-04-08 -80 val_80 2008-04-08 80 val_80 2008-04-08 -82 val_82 2008-04-08 82 val_82 2008-04-08 -84 val_84 2008-04-08 84 val_84 2008-04-08 -84 val_84 2008-04-08 84 val_84 2008-04-08 -84 val_84 2008-04-08 84 val_84 2008-04-08 -84 val_84 2008-04-08 84 val_84 2008-04-08 -86 val_86 2008-04-08 86 val_86 2008-04-08 -95 val_95 2008-04-08 95 val_95 2008-04-08 -95 val_95 2008-04-08 95 val_95 2008-04-08 -95 val_95 2008-04-08 95 val_95 2008-04-08 -95 val_95 2008-04-08 95 val_95 2008-04-08 -97 val_97 2008-04-08 97 val_97 2008-04-08 -97 val_97 2008-04-08 97 val_97 2008-04-08 -97 val_97 2008-04-08 97 val_97 2008-04-08 -97 val_97 2008-04-08 97 val_97 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 105 val_105 2008-04-08 105 val_105 2008-04-08 +11 val_11 2008-04-08 11 val_11 2008-04-08 114 val_114 2008-04-08 114 val_114 2008-04-08 116 val_116 2008-04-08 116 val_116 2008-04-08 118 val_118 2008-04-08 118 val_118 2008-04-08 @@ -456,6 +402,10 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 149 val_149 2008-04-08 149 val_149 2008-04-08 149 val_149 2008-04-08 149 val_149 2008-04-08 149 val_149 2008-04-08 149 val_149 2008-04-08 +15 val_15 2008-04-08 15 val_15 2008-04-08 +15 val_15 2008-04-08 15 val_15 2008-04-08 +15 val_15 2008-04-08 15 val_15 2008-04-08 +15 val_15 2008-04-08 15 val_15 2008-04-08 150 val_150 2008-04-08 150 val_150 2008-04-08 152 val_152 2008-04-08 152 val_152 2008-04-08 152 val_152 2008-04-08 152 val_152 2008-04-08 @@ -493,6 +443,7 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 169 val_169 2008-04-08 169 val_169 2008-04-08 169 val_169 2008-04-08 169 val_169 2008-04-08 169 val_169 2008-04-08 169 val_169 2008-04-08 +17 val_17 2008-04-08 17 val_17 2008-04-08 170 val_170 2008-04-08 170 val_170 2008-04-08 172 val_172 2008-04-08 172 val_172 2008-04-08 172 val_172 2008-04-08 172 val_172 2008-04-08 @@ -519,10 +470,13 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 187 val_187 2008-04-08 187 val_187 2008-04-08 187 val_187 2008-04-08 187 val_187 2008-04-08 189 val_189 2008-04-08 189 val_189 2008-04-08 +19 val_19 2008-04-08 19 val_19 2008-04-08 190 val_190 2008-04-08 190 val_190 2008-04-08 192 val_192 2008-04-08 192 val_192 2008-04-08 194 val_194 2008-04-08 194 val_194 2008-04-08 196 val_196 2008-04-08 196 val_196 2008-04-08 +2 val_2 2008-04-08 2 val_2 2008-04-08 +20 val_20 2008-04-08 20 val_20 2008-04-08 200 val_200 2008-04-08 200 val_200 2008-04-08 200 val_200 2008-04-08 200 val_200 2008-04-08 200 val_200 2008-04-08 200 val_200 2008-04-08 @@ -569,6 +523,10 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 239 val_239 2008-04-08 239 val_239 2008-04-08 239 val_239 2008-04-08 239 val_239 2008-04-08 239 val_239 2008-04-08 239 val_239 2008-04-08 +24 val_24 2008-04-08 24 val_24 2008-04-08 +24 val_24 2008-04-08 24 val_24 2008-04-08 +24 val_24 2008-04-08 24 val_24 2008-04-08 +24 val_24 2008-04-08 24 val_24 2008-04-08 242 val_242 2008-04-08 242 val_242 2008-04-08 242 val_242 2008-04-08 242 val_242 2008-04-08 242 val_242 2008-04-08 242 val_242 2008-04-08 @@ -580,6 +538,10 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 255 val_255 2008-04-08 255 val_255 2008-04-08 255 val_255 2008-04-08 255 val_255 2008-04-08 257 val_257 2008-04-08 257 val_257 2008-04-08 +26 val_26 2008-04-08 26 val_26 2008-04-08 +26 val_26 2008-04-08 26 val_26 2008-04-08 +26 val_26 2008-04-08 26 val_26 2008-04-08 +26 val_26 2008-04-08 26 val_26 2008-04-08 260 val_260 2008-04-08 260 val_260 2008-04-08 262 val_262 2008-04-08 262 val_262 2008-04-08 266 val_266 2008-04-08 266 val_266 2008-04-08 @@ -609,6 +571,7 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 277 val_277 2008-04-08 277 val_277 2008-04-08 277 val_277 2008-04-08 277 val_277 2008-04-08 277 val_277 2008-04-08 277 val_277 2008-04-08 +28 val_28 2008-04-08 28 val_28 2008-04-08 280 val_280 2008-04-08 280 val_280 2008-04-08 280 val_280 2008-04-08 280 val_280 2008-04-08 280 val_280 2008-04-08 280 val_280 2008-04-08 @@ -670,11 +633,21 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 327 val_327 2008-04-08 327 val_327 2008-04-08 327 val_327 2008-04-08 327 val_327 2008-04-08 327 val_327 2008-04-08 327 val_327 2008-04-08 +33 val_33 2008-04-08 33 val_33 2008-04-08 332 val_332 2008-04-08 332 val_332 2008-04-08 336 val_336 2008-04-08 336 val_336 2008-04-08 338 val_338 2008-04-08 338 val_338 2008-04-08 341 val_341 2008-04-08 341 val_341 2008-04-08 345 val_345 2008-04-08 345 val_345 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 356 val_356 2008-04-08 356 val_356 2008-04-08 365 val_365 2008-04-08 365 val_365 2008-04-08 367 val_367 2008-04-08 367 val_367 2008-04-08 @@ -690,6 +663,10 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 369 val_369 2008-04-08 369 val_369 2008-04-08 369 val_369 2008-04-08 369 val_369 2008-04-08 369 val_369 2008-04-08 369 val_369 2008-04-08 +37 val_37 2008-04-08 37 val_37 2008-04-08 +37 val_37 2008-04-08 37 val_37 2008-04-08 +37 val_37 2008-04-08 37 val_37 2008-04-08 +37 val_37 2008-04-08 37 val_37 2008-04-08 374 val_374 2008-04-08 374 val_374 2008-04-08 378 val_378 2008-04-08 378 val_378 2008-04-08 389 val_389 2008-04-08 389 val_389 2008-04-08 @@ -704,6 +681,7 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 396 val_396 2008-04-08 396 val_396 2008-04-08 396 val_396 2008-04-08 396 val_396 2008-04-08 396 val_396 2008-04-08 396 val_396 2008-04-08 +4 val_4 2008-04-08 4 val_4 2008-04-08 400 val_400 2008-04-08 400 val_400 2008-04-08 402 val_402 2008-04-08 402 val_402 2008-04-08 404 val_404 2008-04-08 404 val_404 2008-04-08 @@ -741,6 +719,10 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 417 val_417 2008-04-08 417 val_417 2008-04-08 417 val_417 2008-04-08 417 val_417 2008-04-08 419 val_419 2008-04-08 419 val_419 2008-04-08 +42 val_42 2008-04-08 42 val_42 2008-04-08 +42 val_42 2008-04-08 42 val_42 2008-04-08 +42 val_42 2008-04-08 42 val_42 2008-04-08 +42 val_42 2008-04-08 42 val_42 2008-04-08 424 val_424 2008-04-08 424 val_424 2008-04-08 424 val_424 2008-04-08 424 val_424 2008-04-08 424 val_424 2008-04-08 424 val_424 2008-04-08 @@ -760,6 +742,7 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 439 val_439 2008-04-08 439 val_439 2008-04-08 439 val_439 2008-04-08 439 val_439 2008-04-08 439 val_439 2008-04-08 439 val_439 2008-04-08 +44 val_44 2008-04-08 44 val_44 2008-04-08 444 val_444 2008-04-08 444 val_444 2008-04-08 446 val_446 2008-04-08 446 val_446 2008-04-08 448 val_448 2008-04-08 448 val_448 2008-04-08 @@ -818,68 +801,6 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 493 val_493 2008-04-08 493 val_493 2008-04-08 495 val_495 2008-04-08 495 val_495 2008-04-08 497 val_497 2008-04-08 497 val_497 2008-04-08 -PREHOOK: query: select * from tab a join tab_part b on a.key = b.key -PREHOOK: type: QUERY -PREHOOK: Input: default@tab -PREHOOK: Input: default@tab@ds=2008-04-08 -PREHOOK: Input: default@tab_part -PREHOOK: Input: default@tab_part@ds=2008-04-08 -#### A masked pattern was here #### -POSTHOOK: query: select * from tab a join tab_part b on a.key = b.key -POSTHOOK: type: QUERY -POSTHOOK: Input: default@tab -POSTHOOK: Input: default@tab@ds=2008-04-08 -POSTHOOK: Input: default@tab_part -POSTHOOK: Input: default@tab_part@ds=2008-04-08 -#### A masked pattern was here #### -0 val_0 2008-04-08 0 val_0 2008-04-08 -0 val_0 2008-04-08 0 val_0 2008-04-08 -0 val_0 2008-04-08 0 val_0 2008-04-08 -0 val_0 2008-04-08 0 val_0 2008-04-08 -0 val_0 2008-04-08 0 val_0 2008-04-08 -0 val_0 2008-04-08 0 val_0 2008-04-08 -0 val_0 2008-04-08 0 val_0 2008-04-08 -0 val_0 2008-04-08 0 val_0 2008-04-08 -0 val_0 2008-04-08 0 val_0 2008-04-08 -2 val_2 2008-04-08 2 val_2 2008-04-08 -4 val_4 2008-04-08 4 val_4 2008-04-08 -8 val_8 2008-04-08 8 val_8 2008-04-08 -11 val_11 2008-04-08 11 val_11 2008-04-08 -15 val_15 2008-04-08 15 val_15 2008-04-08 -15 val_15 2008-04-08 15 val_15 2008-04-08 -15 val_15 2008-04-08 15 val_15 2008-04-08 -15 val_15 2008-04-08 15 val_15 2008-04-08 -17 val_17 2008-04-08 17 val_17 2008-04-08 -19 val_19 2008-04-08 19 val_19 2008-04-08 -20 val_20 2008-04-08 20 val_20 2008-04-08 -24 val_24 2008-04-08 24 val_24 2008-04-08 -24 val_24 2008-04-08 24 val_24 2008-04-08 -24 val_24 2008-04-08 24 val_24 2008-04-08 -24 val_24 2008-04-08 24 val_24 2008-04-08 -26 val_26 2008-04-08 26 val_26 2008-04-08 -26 val_26 2008-04-08 26 val_26 2008-04-08 -26 val_26 2008-04-08 26 val_26 2008-04-08 -26 val_26 2008-04-08 26 val_26 2008-04-08 -28 val_28 2008-04-08 28 val_28 2008-04-08 -33 val_33 2008-04-08 33 val_33 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -35 val_35 2008-04-08 35 val_35 2008-04-08 -37 val_37 2008-04-08 37 val_37 2008-04-08 -37 val_37 2008-04-08 37 val_37 2008-04-08 -37 val_37 2008-04-08 37 val_37 2008-04-08 -37 val_37 2008-04-08 37 val_37 2008-04-08 -42 val_42 2008-04-08 42 val_42 2008-04-08 -42 val_42 2008-04-08 42 val_42 2008-04-08 -42 val_42 2008-04-08 42 val_42 2008-04-08 -42 val_42 2008-04-08 42 val_42 2008-04-08 -44 val_44 2008-04-08 44 val_44 2008-04-08 51 val_51 2008-04-08 51 val_51 2008-04-08 51 val_51 2008-04-08 51 val_51 2008-04-08 51 val_51 2008-04-08 51 val_51 2008-04-08 @@ -889,6 +810,7 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 64 val_64 2008-04-08 64 val_64 2008-04-08 66 val_66 2008-04-08 66 val_66 2008-04-08 77 val_77 2008-04-08 77 val_77 2008-04-08 +8 val_8 2008-04-08 8 val_8 2008-04-08 80 val_80 2008-04-08 80 val_80 2008-04-08 82 val_82 2008-04-08 82 val_82 2008-04-08 84 val_84 2008-04-08 84 val_84 2008-04-08 @@ -904,11 +826,37 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 97 val_97 2008-04-08 97 val_97 2008-04-08 97 val_97 2008-04-08 97 val_97 2008-04-08 97 val_97 2008-04-08 97 val_97 2008-04-08 +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from tab a join tab_part b on a.key = b.key +PREHOOK: type: QUERY +PREHOOK: Input: default@tab +PREHOOK: Input: default@tab@ds=2008-04-08 +PREHOOK: Input: default@tab_part +PREHOOK: Input: default@tab_part@ds=2008-04-08 +#### A masked pattern was here #### +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from tab a join tab_part b on a.key = b.key +POSTHOOK: type: QUERY +POSTHOOK: Input: default@tab +POSTHOOK: Input: default@tab@ds=2008-04-08 +POSTHOOK: Input: default@tab_part +POSTHOOK: Input: default@tab_part@ds=2008-04-08 +#### A masked pattern was here #### +0 val_0 2008-04-08 0 val_0 2008-04-08 +0 val_0 2008-04-08 0 val_0 2008-04-08 +0 val_0 2008-04-08 0 val_0 2008-04-08 +0 val_0 2008-04-08 0 val_0 2008-04-08 +0 val_0 2008-04-08 0 val_0 2008-04-08 +0 val_0 2008-04-08 0 val_0 2008-04-08 +0 val_0 2008-04-08 0 val_0 2008-04-08 +0 val_0 2008-04-08 0 val_0 2008-04-08 +0 val_0 2008-04-08 0 val_0 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 103 val_103 2008-04-08 105 val_105 2008-04-08 105 val_105 2008-04-08 +11 val_11 2008-04-08 11 val_11 2008-04-08 114 val_114 2008-04-08 114 val_114 2008-04-08 116 val_116 2008-04-08 116 val_116 2008-04-08 118 val_118 2008-04-08 118 val_118 2008-04-08 @@ -950,6 +898,10 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 149 val_149 2008-04-08 149 val_149 2008-04-08 149 val_149 2008-04-08 149 val_149 2008-04-08 149 val_149 2008-04-08 149 val_149 2008-04-08 +15 val_15 2008-04-08 15 val_15 2008-04-08 +15 val_15 2008-04-08 15 val_15 2008-04-08 +15 val_15 2008-04-08 15 val_15 2008-04-08 +15 val_15 2008-04-08 15 val_15 2008-04-08 150 val_150 2008-04-08 150 val_150 2008-04-08 152 val_152 2008-04-08 152 val_152 2008-04-08 152 val_152 2008-04-08 152 val_152 2008-04-08 @@ -987,6 +939,7 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 169 val_169 2008-04-08 169 val_169 2008-04-08 169 val_169 2008-04-08 169 val_169 2008-04-08 169 val_169 2008-04-08 169 val_169 2008-04-08 +17 val_17 2008-04-08 17 val_17 2008-04-08 170 val_170 2008-04-08 170 val_170 2008-04-08 172 val_172 2008-04-08 172 val_172 2008-04-08 172 val_172 2008-04-08 172 val_172 2008-04-08 @@ -1013,10 +966,13 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 187 val_187 2008-04-08 187 val_187 2008-04-08 187 val_187 2008-04-08 187 val_187 2008-04-08 189 val_189 2008-04-08 189 val_189 2008-04-08 +19 val_19 2008-04-08 19 val_19 2008-04-08 190 val_190 2008-04-08 190 val_190 2008-04-08 192 val_192 2008-04-08 192 val_192 2008-04-08 194 val_194 2008-04-08 194 val_194 2008-04-08 196 val_196 2008-04-08 196 val_196 2008-04-08 +2 val_2 2008-04-08 2 val_2 2008-04-08 +20 val_20 2008-04-08 20 val_20 2008-04-08 200 val_200 2008-04-08 200 val_200 2008-04-08 200 val_200 2008-04-08 200 val_200 2008-04-08 200 val_200 2008-04-08 200 val_200 2008-04-08 @@ -1063,6 +1019,10 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 239 val_239 2008-04-08 239 val_239 2008-04-08 239 val_239 2008-04-08 239 val_239 2008-04-08 239 val_239 2008-04-08 239 val_239 2008-04-08 +24 val_24 2008-04-08 24 val_24 2008-04-08 +24 val_24 2008-04-08 24 val_24 2008-04-08 +24 val_24 2008-04-08 24 val_24 2008-04-08 +24 val_24 2008-04-08 24 val_24 2008-04-08 242 val_242 2008-04-08 242 val_242 2008-04-08 242 val_242 2008-04-08 242 val_242 2008-04-08 242 val_242 2008-04-08 242 val_242 2008-04-08 @@ -1074,6 +1034,10 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 255 val_255 2008-04-08 255 val_255 2008-04-08 255 val_255 2008-04-08 255 val_255 2008-04-08 257 val_257 2008-04-08 257 val_257 2008-04-08 +26 val_26 2008-04-08 26 val_26 2008-04-08 +26 val_26 2008-04-08 26 val_26 2008-04-08 +26 val_26 2008-04-08 26 val_26 2008-04-08 +26 val_26 2008-04-08 26 val_26 2008-04-08 260 val_260 2008-04-08 260 val_260 2008-04-08 262 val_262 2008-04-08 262 val_262 2008-04-08 266 val_266 2008-04-08 266 val_266 2008-04-08 @@ -1103,6 +1067,7 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 277 val_277 2008-04-08 277 val_277 2008-04-08 277 val_277 2008-04-08 277 val_277 2008-04-08 277 val_277 2008-04-08 277 val_277 2008-04-08 +28 val_28 2008-04-08 28 val_28 2008-04-08 280 val_280 2008-04-08 280 val_280 2008-04-08 280 val_280 2008-04-08 280 val_280 2008-04-08 280 val_280 2008-04-08 280 val_280 2008-04-08 @@ -1164,11 +1129,21 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 327 val_327 2008-04-08 327 val_327 2008-04-08 327 val_327 2008-04-08 327 val_327 2008-04-08 327 val_327 2008-04-08 327 val_327 2008-04-08 +33 val_33 2008-04-08 33 val_33 2008-04-08 332 val_332 2008-04-08 332 val_332 2008-04-08 336 val_336 2008-04-08 336 val_336 2008-04-08 338 val_338 2008-04-08 338 val_338 2008-04-08 341 val_341 2008-04-08 341 val_341 2008-04-08 345 val_345 2008-04-08 345 val_345 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 +35 val_35 2008-04-08 35 val_35 2008-04-08 356 val_356 2008-04-08 356 val_356 2008-04-08 365 val_365 2008-04-08 365 val_365 2008-04-08 367 val_367 2008-04-08 367 val_367 2008-04-08 @@ -1184,6 +1159,10 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 369 val_369 2008-04-08 369 val_369 2008-04-08 369 val_369 2008-04-08 369 val_369 2008-04-08 369 val_369 2008-04-08 369 val_369 2008-04-08 +37 val_37 2008-04-08 37 val_37 2008-04-08 +37 val_37 2008-04-08 37 val_37 2008-04-08 +37 val_37 2008-04-08 37 val_37 2008-04-08 +37 val_37 2008-04-08 37 val_37 2008-04-08 374 val_374 2008-04-08 374 val_374 2008-04-08 378 val_378 2008-04-08 378 val_378 2008-04-08 389 val_389 2008-04-08 389 val_389 2008-04-08 @@ -1198,6 +1177,7 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 396 val_396 2008-04-08 396 val_396 2008-04-08 396 val_396 2008-04-08 396 val_396 2008-04-08 396 val_396 2008-04-08 396 val_396 2008-04-08 +4 val_4 2008-04-08 4 val_4 2008-04-08 400 val_400 2008-04-08 400 val_400 2008-04-08 402 val_402 2008-04-08 402 val_402 2008-04-08 404 val_404 2008-04-08 404 val_404 2008-04-08 @@ -1235,6 +1215,10 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 417 val_417 2008-04-08 417 val_417 2008-04-08 417 val_417 2008-04-08 417 val_417 2008-04-08 419 val_419 2008-04-08 419 val_419 2008-04-08 +42 val_42 2008-04-08 42 val_42 2008-04-08 +42 val_42 2008-04-08 42 val_42 2008-04-08 +42 val_42 2008-04-08 42 val_42 2008-04-08 +42 val_42 2008-04-08 42 val_42 2008-04-08 424 val_424 2008-04-08 424 val_424 2008-04-08 424 val_424 2008-04-08 424 val_424 2008-04-08 424 val_424 2008-04-08 424 val_424 2008-04-08 @@ -1254,6 +1238,7 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 439 val_439 2008-04-08 439 val_439 2008-04-08 439 val_439 2008-04-08 439 val_439 2008-04-08 439 val_439 2008-04-08 439 val_439 2008-04-08 +44 val_44 2008-04-08 44 val_44 2008-04-08 444 val_444 2008-04-08 444 val_444 2008-04-08 446 val_446 2008-04-08 446 val_446 2008-04-08 448 val_448 2008-04-08 448 val_448 2008-04-08 @@ -1312,6 +1297,31 @@ POSTHOOK: Input: default@tab_part@ds=2008-04-08 493 val_493 2008-04-08 493 val_493 2008-04-08 495 val_495 2008-04-08 495 val_495 2008-04-08 497 val_497 2008-04-08 497 val_497 2008-04-08 +51 val_51 2008-04-08 51 val_51 2008-04-08 +51 val_51 2008-04-08 51 val_51 2008-04-08 +51 val_51 2008-04-08 51 val_51 2008-04-08 +51 val_51 2008-04-08 51 val_51 2008-04-08 +53 val_53 2008-04-08 53 val_53 2008-04-08 +57 val_57 2008-04-08 57 val_57 2008-04-08 +64 val_64 2008-04-08 64 val_64 2008-04-08 +66 val_66 2008-04-08 66 val_66 2008-04-08 +77 val_77 2008-04-08 77 val_77 2008-04-08 +8 val_8 2008-04-08 8 val_8 2008-04-08 +80 val_80 2008-04-08 80 val_80 2008-04-08 +82 val_82 2008-04-08 82 val_82 2008-04-08 +84 val_84 2008-04-08 84 val_84 2008-04-08 +84 val_84 2008-04-08 84 val_84 2008-04-08 +84 val_84 2008-04-08 84 val_84 2008-04-08 +84 val_84 2008-04-08 84 val_84 2008-04-08 +86 val_86 2008-04-08 86 val_86 2008-04-08 +95 val_95 2008-04-08 95 val_95 2008-04-08 +95 val_95 2008-04-08 95 val_95 2008-04-08 +95 val_95 2008-04-08 95 val_95 2008-04-08 +95 val_95 2008-04-08 95 val_95 2008-04-08 +97 val_97 2008-04-08 97 val_97 2008-04-08 +97 val_97 2008-04-08 97 val_97 2008-04-08 +97 val_97 2008-04-08 97 val_97 2008-04-08 +97 val_97 2008-04-08 97 val_97 2008-04-08 PREHOOK: query: explain select count(*) from tab a left outer join tab_part b on a.key = b.key diff --git a/ql/src/test/results/clientpositive/tez/tez_join_tests.q.out b/ql/src/test/results/clientpositive/tez/tez_join_tests.q.out index 88523dc..8887ebb 100644 --- a/ql/src/test/results/clientpositive/tez/tez_join_tests.q.out +++ b/ql/src/test/results/clientpositive/tez/tez_join_tests.q.out @@ -1973,12 +1973,14 @@ POSTHOOK: Input: default@src1 98 val_98 98 val_98 98 val_98 98 val_98 98 val_98 98 val_98 98 val_98 98 val_98 98 val_98 -PREHOOK: query: select * from src1 a left outer join src b on (a.key = b.key) join src c on (a.key = c.key) +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from src1 a left outer join src b on (a.key = b.key) join src c on (a.key = c.key) PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@src1 #### A masked pattern was here #### -POSTHOOK: query: select * from src1 a left outer join src b on (a.key = b.key) join src c on (a.key = c.key) +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from src1 a left outer join src b on (a.key = b.key) join src c on (a.key = c.key) POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@src1 @@ -2090,12 +2092,14 @@ POSTHOOK: Input: default@src1 98 val_98 98 val_98 98 val_98 98 val_98 98 val_98 98 val_98 98 val_98 98 val_98 98 val_98 -PREHOOK: query: select * from src1 a join src b on (a.key = b.key) join src c on (a.key = c.key) +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from src1 a join src b on (a.key = b.key) join src c on (a.key = c.key) PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@src1 #### A masked pattern was here #### -POSTHOOK: query: select * from src1 a join src b on (a.key = b.key) join src c on (a.key = c.key) +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from src1 a join src b on (a.key = b.key) join src c on (a.key = c.key) POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@src1 diff --git a/ql/src/test/results/clientpositive/tez/tez_joins_explain.q.out b/ql/src/test/results/clientpositive/tez/tez_joins_explain.q.out index 668f75b..8e8634a 100644 --- a/ql/src/test/results/clientpositive/tez/tez_joins_explain.q.out +++ b/ql/src/test/results/clientpositive/tez/tez_joins_explain.q.out @@ -1,10 +1,8 @@ PREHOOK: query: -- SORT_QUERY_RESULTS - explain select * from (select b.key, b.value from src1 a left outer join src b on (a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) order by x.key PREHOOK: type: QUERY POSTHOOK: query: -- SORT_QUERY_RESULTS - explain select * from (select b.key, b.value from src1 a left outer join src b on (a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) order by x.key POSTHOOK: type: QUERY @@ -128,12 +126,14 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select * from (select b.key, b.value from src1 a left outer join src b on (a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) order by x.key +PREHOOK: query: -- SORT_QUERY_RESULTS +select * from (select b.key, b.value from src1 a left outer join src b on (a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) order by x.key PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Input: default@src1 #### A masked pattern was here #### -POSTHOOK: query: select * from (select b.key, b.value from src1 a left outer join src b on (a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) order by x.key +POSTHOOK: query: -- SORT_QUERY_RESULTS +select * from (select b.key, b.value from src1 a left outer join src b on (a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) order by x.key POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Input: default@src1 diff --git a/ql/src/test/results/clientpositive/tez/vector_data_types.q.out b/ql/src/test/results/clientpositive/tez/vector_data_types.q.out index eca2cbc..972404b 100644 --- a/ql/src/test/results/clientpositive/tez/vector_data_types.q.out +++ b/ql/src/test/results/clientpositive/tez/vector_data_types.q.out @@ -97,9 +97,9 @@ POSTHOOK: Lineage: over1korc.s SIMPLE [(over1k)over1k.FieldSchema(name:s, type:s POSTHOOK: Lineage: over1korc.si SIMPLE [(over1k)over1k.FieldSchema(name:si, type:smallint, comment:null), ] POSTHOOK: Lineage: over1korc.t SIMPLE [(over1k)over1k.FieldSchema(name:t, type:tinyint, comment:null), ] POSTHOOK: Lineage: over1korc.ts SIMPLE [(over1k)over1k.FieldSchema(name:ts, type:timestamp, comment:null), ] -PREHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +PREHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +POSTHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -122,14 +122,14 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10 Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator - key expressions: _col2 (type: int) - sort order: + + key expressions: _col0 (type: tinyint), _col1 (type: smallint), _col2 (type: int) + sort order: +++ Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: tinyint), _col1 (type: smallint), _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: boolean), _col7 (type: string), _col8 (type: timestamp), _col9 (type: decimal(4,2)), _col10 (type: binary) + value expressions: _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: boolean), _col7 (type: string), _col8 (type: timestamp), _col9 (type: decimal(4,2)), _col10 (type: binary) Reducer 2 Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: tinyint), VALUE._col1 (type: smallint), KEY.reducesinkkey0 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: double), VALUE._col5 (type: boolean), VALUE._col6 (type: string), VALUE._col7 (type: timestamp), VALUE._col8 (type: decimal(4,2)), VALUE._col9 (type: binary) + expressions: KEY.reducesinkkey0 (type: tinyint), KEY.reducesinkkey1 (type: smallint), KEY.reducesinkkey2 (type: int), VALUE._col0 (type: bigint), VALUE._col1 (type: float), VALUE._col2 (type: double), VALUE._col3 (type: boolean), VALUE._col4 (type: string), VALUE._col5 (type: timestamp), VALUE._col6 (type: decimal(4,2)), VALUE._col7 (type: binary) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10 Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE Limit @@ -149,48 +149,48 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### -POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### -108 301 65536 4294967357 90.05 17.59 true ethan johnson 2013-03-01 09:11:58.703271 75.7 undecided -118 497 65536 4294967381 50.32 12.72 false david nixon 2013-03-01 09:11:58.703285 83.48 values clariffication -18 280 65536 4294967320 32.92 45.94 false holly white 2013-03-01 09:11:58.703086 58.86 topology -69 489 65536 4294967404 33.52 17.99 false oscar ichabod 2013-03-01 09:11:58.703247 32.68 topology -27 405 65536 4294967508 82.24 29.41 true oscar ovid 2013-03-01 09:11:58.703166 16.85 biology -42 495 65536 4294967431 43.57 46.81 false tom johnson 2013-03-01 09:11:58.703245 62.25 american history +NULL 374 65560 4294967516 65.43 22.48 true oscar quirinius 2013-03-01 09:11:58.703316 16.86 mathematics NULL 409 65536 4294967490 46.97 25.92 false fred miller 2013-03-01 09:11:58.703116 33.45 history -59 431 65537 4294967326 11.34 2.9 true oscar robinson 2013-03-01 09:11:58.703161 81.04 zync studies -63 458 65537 4294967463 21.94 49.71 true fred van buren 2013-03-01 09:11:58.703278 99.34 wind surfing -121 355 65537 4294967437 85.9 10.99 true calvin brown 2013-03-01 09:11:58.703254 4.49 yard duty -72 267 65537 4294967460 55.2 42.89 false oscar carson 2013-03-01 09:11:58.703153 51.91 topology -22 264 65537 4294967419 8.07 10.71 false david xylophone 2013-03-01 09:11:58.703136 11.87 undecided -101 283 65538 4294967527 84.03 27.29 true yuri brown 2013-03-01 09:11:58.703306 44.24 biology -109 376 65538 4294967453 59.61 35.62 true priscilla xylophone 2013-03-01 09:11:58.703286 9.53 study skills -83 353 65538 4294967339 0.08 23.91 true holly thompson 2013-03-01 09:11:58.703157 30.27 quiet hour -29 331 65539 4294967420 73.18 28.96 true ethan brown 2013-03-01 09:11:58.703094 58.85 zync studies -70 430 65539 4294967534 18.89 43.84 true tom carson 2013-03-01 09:11:58.703182 21.93 joggying -120 331 65539 4294967324 88.02 40.94 true holly nixon 2013-03-01 09:11:58.703262 96.64 yard duty -71 298 65540 4294967510 91.63 9.6 false gabriella zipper 2013-03-01 09:11:58.70314 68.14 geology -114 385 65541 4294967458 73.48 34.97 true oscar quirinius 2013-03-01 09:11:58.703143 72.33 xylophone band +NULL 473 65720 4294967324 80.74 40.6 false holly falkner 2013-03-01 09:11:58.703111 18.8 mathematics +-3 275 65622 4294967302 71.78 8.49 false wendy robinson 2013-03-01 09:11:58.703294 95.39 undecided +-3 344 65733 4294967363 0.56 11.96 true rachel thompson 2013-03-01 09:11:58.703276 88.46 wind surfing +-3 376 65548 4294967431 96.78 43.23 false fred ellison 2013-03-01 09:11:58.703233 75.39 education +-3 438 65618 4294967398 62.39 4.62 false victor xylophone 2013-03-01 09:11:58.703135 88.38 values clariffication +-3 458 65696 4294967418 45.24 8.49 false irene ellison 2013-03-01 09:11:58.703092 54.02 american history +-3 467 65575 4294967437 81.64 23.53 true tom hernandez 2013-03-01 09:11:58.703188 32.85 study skills +-2 261 65603 4294967332 39.18 28.98 false fred polk 2013-03-01 09:11:58.70331 69.26 opthamology +-2 269 65681 4294967544 99.24 28.19 false rachel falkner 2013-03-01 09:11:58.703089 41.57 quiet hour +-2 288 65658 4294967383 53.78 19.92 false holly nixon 2013-03-01 09:11:58.703224 42.93 industrial engineering +-2 304 65629 4294967386 84.38 33.49 false zach garcia 2013-03-01 09:11:58.703264 56.99 chemistry +-2 340 65627 4294967533 76.52 21.91 true quinn laertes 2013-03-01 09:11:58.703178 93.29 xylophone band +-2 427 65666 4294967465 19.69 33.24 true bob xylophone 2013-03-01 09:11:58.703219 32.73 joggying +-2 429 65664 4294967441 45.19 40.43 false wendy king 2013-03-01 09:11:58.703265 11.46 industrial engineering +-2 461 65648 4294967425 58.52 24.85 false rachel thompson 2013-03-01 09:11:58.703318 85.62 zync studies +-1 268 65778 4294967418 56.33 44.73 true calvin falkner 2013-03-01 09:11:58.70322 7.37 history +-1 281 65643 4294967323 15.1 45.0 false irene nixon 2013-03-01 09:11:58.703223 80.96 undecided +-1 300 65663 4294967343 71.26 34.62 true calvin ovid 2013-03-01 09:11:58.703262 78.56 study skills PREHOOK: query: 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 PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### POSTHOOK: query: 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 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### -17045922556 -PREHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +PREHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +POSTHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -213,15 +213,15 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10 Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator - key expressions: _col2 (type: int) - sort order: + + key expressions: _col0 (type: tinyint), _col1 (type: smallint), _col2 (type: int) + sort order: +++ Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: tinyint), _col1 (type: smallint), _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: boolean), _col7 (type: string), _col8 (type: timestamp), _col9 (type: decimal(4,2)), _col10 (type: binary) + value expressions: _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: boolean), _col7 (type: string), _col8 (type: timestamp), _col9 (type: decimal(4,2)), _col10 (type: binary) Execution mode: vectorized Reducer 2 Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: tinyint), VALUE._col1 (type: smallint), KEY.reducesinkkey0 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: double), VALUE._col5 (type: boolean), VALUE._col6 (type: string), VALUE._col7 (type: timestamp), VALUE._col8 (type: decimal(4,2)), VALUE._col9 (type: binary) + expressions: KEY.reducesinkkey0 (type: tinyint), KEY.reducesinkkey1 (type: smallint), KEY.reducesinkkey2 (type: int), VALUE._col0 (type: bigint), VALUE._col1 (type: float), VALUE._col2 (type: double), VALUE._col3 (type: boolean), VALUE._col4 (type: string), VALUE._col5 (type: timestamp), VALUE._col6 (type: decimal(4,2)), VALUE._col7 (type: binary) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10 Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE Limit @@ -242,41 +242,41 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### -POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### -108 301 65536 4294967357 90.05 17.59 true ethan johnson 2013-03-01 09:11:58.703271 75.7 undecided -118 497 65536 4294967381 50.32 12.72 false david nixon 2013-03-01 09:11:58.703285 83.48 values clariffication -18 280 65536 4294967320 32.92 45.94 false holly white 2013-03-01 09:11:58.703086 58.86 topology -69 489 65536 4294967404 33.52 17.99 false oscar ichabod 2013-03-01 09:11:58.703247 32.68 topology -27 405 65536 4294967508 82.24 29.41 true oscar ovid 2013-03-01 09:11:58.703166 16.85 biology -42 495 65536 4294967431 43.57 46.81 false tom johnson 2013-03-01 09:11:58.703245 62.25 american history +NULL 374 65560 4294967516 65.43 22.48 true oscar quirinius 2013-03-01 09:11:58.703316 16.86 mathematics NULL 409 65536 4294967490 46.97 25.92 false fred miller 2013-03-01 09:11:58.703116 33.45 history -59 431 65537 4294967326 11.34 2.9 true oscar robinson 2013-03-01 09:11:58.703161 81.04 zync studies -63 458 65537 4294967463 21.94 49.71 true fred van buren 2013-03-01 09:11:58.703278 99.34 wind surfing -121 355 65537 4294967437 85.9 10.99 true calvin brown 2013-03-01 09:11:58.703254 4.49 yard duty -72 267 65537 4294967460 55.2 42.89 false oscar carson 2013-03-01 09:11:58.703153 51.91 topology -22 264 65537 4294967419 8.07 10.71 false david xylophone 2013-03-01 09:11:58.703136 11.87 undecided -101 283 65538 4294967527 84.03 27.29 true yuri brown 2013-03-01 09:11:58.703306 44.24 biology -109 376 65538 4294967453 59.61 35.62 true priscilla xylophone 2013-03-01 09:11:58.703286 9.53 study skills -83 353 65538 4294967339 0.08 23.91 true holly thompson 2013-03-01 09:11:58.703157 30.27 quiet hour -29 331 65539 4294967420 73.18 28.96 true ethan brown 2013-03-01 09:11:58.703094 58.85 zync studies -70 430 65539 4294967534 18.89 43.84 true tom carson 2013-03-01 09:11:58.703182 21.93 joggying -120 331 65539 4294967324 88.02 40.94 true holly nixon 2013-03-01 09:11:58.703262 96.64 yard duty -71 298 65540 4294967510 91.63 9.6 false gabriella zipper 2013-03-01 09:11:58.70314 68.14 geology -114 385 65541 4294967458 73.48 34.97 true oscar quirinius 2013-03-01 09:11:58.703143 72.33 xylophone band +NULL 473 65720 4294967324 80.74 40.6 false holly falkner 2013-03-01 09:11:58.703111 18.8 mathematics +-3 275 65622 4294967302 71.78 8.49 false wendy robinson 2013-03-01 09:11:58.703294 95.39 undecided +-3 344 65733 4294967363 0.56 11.96 true rachel thompson 2013-03-01 09:11:58.703276 88.46 wind surfing +-3 376 65548 4294967431 96.78 43.23 false fred ellison 2013-03-01 09:11:58.703233 75.39 education +-3 438 65618 4294967398 62.39 4.62 false victor xylophone 2013-03-01 09:11:58.703135 88.38 values clariffication +-3 458 65696 4294967418 45.24 8.49 false irene ellison 2013-03-01 09:11:58.703092 54.02 american history +-3 467 65575 4294967437 81.64 23.53 true tom hernandez 2013-03-01 09:11:58.703188 32.85 study skills +-2 261 65603 4294967332 39.18 28.98 false fred polk 2013-03-01 09:11:58.70331 69.26 opthamology +-2 269 65681 4294967544 99.24 28.19 false rachel falkner 2013-03-01 09:11:58.703089 41.57 quiet hour +-2 288 65658 4294967383 53.78 19.92 false holly nixon 2013-03-01 09:11:58.703224 42.93 industrial engineering +-2 304 65629 4294967386 84.38 33.49 false zach garcia 2013-03-01 09:11:58.703264 56.99 chemistry +-2 340 65627 4294967533 76.52 21.91 true quinn laertes 2013-03-01 09:11:58.703178 93.29 xylophone band +-2 427 65666 4294967465 19.69 33.24 true bob xylophone 2013-03-01 09:11:58.703219 32.73 joggying +-2 429 65664 4294967441 45.19 40.43 false wendy king 2013-03-01 09:11:58.703265 11.46 industrial engineering +-2 461 65648 4294967425 58.52 24.85 false rachel thompson 2013-03-01 09:11:58.703318 85.62 zync studies +-1 268 65778 4294967418 56.33 44.73 true calvin falkner 2013-03-01 09:11:58.70322 7.37 history +-1 281 65643 4294967323 15.1 45.0 false irene nixon 2013-03-01 09:11:58.703223 80.96 undecided +-1 300 65663 4294967343 71.26 34.62 true calvin ovid 2013-03-01 09:11:58.703262 78.56 study skills PREHOOK: query: 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 PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### POSTHOOK: query: 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 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/tez/vectorization_part_project.q.out b/ql/src/test/results/clientpositive/tez/vectorization_part_project.q.out index 40c4522..a5eabf8 100644 --- a/ql/src/test/results/clientpositive/tez/vectorization_part_project.q.out +++ b/ql/src/test/results/clientpositive/tez/vectorization_part_project.q.out @@ -6,11 +6,11 @@ POSTHOOK: query: CREATE TABLE alltypesorc_part(ctinyint tinyint, csmallint small POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@alltypesorc_part -PREHOOK: query: insert overwrite table alltypesorc_part partition (ds='2011') select * from alltypesorc limit 100 +PREHOOK: query: insert overwrite table alltypesorc_part partition (ds='2011') select * from alltypesorc order by ctinyint, cint, cbigint limit 100 PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc PREHOOK: Output: default@alltypesorc_part@ds=2011 -POSTHOOK: query: insert overwrite table alltypesorc_part partition (ds='2011') select * from alltypesorc limit 100 +POSTHOOK: query: insert overwrite table alltypesorc_part partition (ds='2011') select * from alltypesorc order by ctinyint, cint, cbigint limit 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc POSTHOOK: Output: default@alltypesorc_part@ds=2011 @@ -26,11 +26,11 @@ POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring2 SIMPLE [(alltype POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:null), ] POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:null), ] -PREHOOK: query: insert overwrite table alltypesorc_part partition (ds='2012') select * from alltypesorc limit 100 +PREHOOK: query: insert overwrite table alltypesorc_part partition (ds='2012') select * from alltypesorc order by ctinyint, cint, cbigint limit 100 PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc PREHOOK: Output: default@alltypesorc_part@ds=2012 -POSTHOOK: query: insert overwrite table alltypesorc_part partition (ds='2012') select * from alltypesorc limit 100 +POSTHOOK: query: insert overwrite table alltypesorc_part partition (ds='2012') select * from alltypesorc order by ctinyint, cint, cbigint limit 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc POSTHOOK: Output: default@alltypesorc_part@ds=2012 @@ -65,28 +65,28 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc_part - Statistics: Num rows: 200 Data size: 41576 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 200 Data size: 54496 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (cdouble + 2.0) (type: double) outputColumnNames: _col0 - Statistics: Num rows: 200 Data size: 41576 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 200 Data size: 54496 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: double) sort order: + - Statistics: Num rows: 200 Data size: 41576 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 200 Data size: 54496 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Reducer 2 Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: double) outputColumnNames: _col0 - Statistics: Num rows: 200 Data size: 41576 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 200 Data size: 54496 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 10 - Statistics: Num rows: 10 Data size: 2070 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 2720 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 10 Data size: 2070 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 2720 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -111,13 +111,13 @@ POSTHOOK: Input: default@alltypesorc_part POSTHOOK: Input: default@alltypesorc_part@ds=2011 POSTHOOK: Input: default@alltypesorc_part@ds=2012 #### A masked pattern was here #### --15910.0 --15910.0 --15811.0 --15811.0 --15788.0 --15788.0 --15547.0 --15547.0 --15429.0 --15429.0 +NULL +NULL +-15863.0 +-15863.0 +-14988.0 +-14988.0 +-14646.0 +-14646.0 +-14236.0 +-14236.0 diff --git a/ql/src/test/results/clientpositive/tez/vectorized_rcfile_columnar.q.out b/ql/src/test/results/clientpositive/tez/vectorized_rcfile_columnar.q.out index ee8959b..c35173e 100644 --- a/ql/src/test/results/clientpositive/tez/vectorized_rcfile_columnar.q.out +++ b/ql/src/test/results/clientpositive/tez/vectorized_rcfile_columnar.q.out @@ -23,12 +23,12 @@ POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@columnTable PREHOOK: query: 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 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@columntable POSTHOOK: query: 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 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@columntable @@ -50,13 +50,13 @@ POSTHOOK: query: SELECT key, value FROM columnTable ORDER BY key POSTHOOK: type: QUERY POSTHOOK: Input: default@columntable #### A masked pattern was here #### -165 val_165 -238 val_238 -255 val_255 -27 val_27 -278 val_278 -311 val_311 -409 val_409 -484 val_484 -86 val_86 -98 val_98 +0 val_0 +0 val_0 +0 val_0 +10 val_10 +100 val_100 +100 val_100 +103 val_103 +103 val_103 +104 val_104 +104 val_104 diff --git a/ql/src/test/results/clientpositive/vector_data_types.q.out b/ql/src/test/results/clientpositive/vector_data_types.q.out index 65aa5e9..3ed833b 100644 --- a/ql/src/test/results/clientpositive/vector_data_types.q.out +++ b/ql/src/test/results/clientpositive/vector_data_types.q.out @@ -97,9 +97,9 @@ POSTHOOK: Lineage: over1korc.s SIMPLE [(over1k)over1k.FieldSchema(name:s, type:s POSTHOOK: Lineage: over1korc.si SIMPLE [(over1k)over1k.FieldSchema(name:si, type:smallint, comment:null), ] POSTHOOK: Lineage: over1korc.t SIMPLE [(over1k)over1k.FieldSchema(name:t, type:tinyint, comment:null), ] POSTHOOK: Lineage: over1korc.ts SIMPLE [(over1k)over1k.FieldSchema(name:ts, type:timestamp, comment:null), ] -PREHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +PREHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +POSTHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -117,13 +117,13 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10 Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator - key expressions: _col2 (type: int) - sort order: + + key expressions: _col0 (type: tinyint), _col1 (type: smallint), _col2 (type: int) + sort order: +++ Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: tinyint), _col1 (type: smallint), _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: boolean), _col7 (type: string), _col8 (type: timestamp), _col9 (type: decimal(4,2)), _col10 (type: binary) + value expressions: _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: boolean), _col7 (type: string), _col8 (type: timestamp), _col9 (type: decimal(4,2)), _col10 (type: binary) Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: tinyint), VALUE._col1 (type: smallint), KEY.reducesinkkey0 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: double), VALUE._col5 (type: boolean), VALUE._col6 (type: string), VALUE._col7 (type: timestamp), VALUE._col8 (type: decimal(4,2)), VALUE._col9 (type: binary) + expressions: KEY.reducesinkkey0 (type: tinyint), KEY.reducesinkkey1 (type: smallint), KEY.reducesinkkey2 (type: int), VALUE._col0 (type: bigint), VALUE._col1 (type: float), VALUE._col2 (type: double), VALUE._col3 (type: boolean), VALUE._col4 (type: string), VALUE._col5 (type: timestamp), VALUE._col6 (type: decimal(4,2)), VALUE._col7 (type: binary) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10 Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE Limit @@ -143,48 +143,48 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### -POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### -108 301 65536 4294967357 90.05 17.59 true ethan johnson 2013-03-01 09:11:58.703271 75.7 undecided -118 497 65536 4294967381 50.32 12.72 false david nixon 2013-03-01 09:11:58.703285 83.48 values clariffication -18 280 65536 4294967320 32.92 45.94 false holly white 2013-03-01 09:11:58.703086 58.86 topology -69 489 65536 4294967404 33.52 17.99 false oscar ichabod 2013-03-01 09:11:58.703247 32.68 topology -27 405 65536 4294967508 82.24 29.41 true oscar ovid 2013-03-01 09:11:58.703166 16.85 biology -42 495 65536 4294967431 43.57 46.81 false tom johnson 2013-03-01 09:11:58.703245 62.25 american history +NULL 374 65560 4294967516 65.43 22.48 true oscar quirinius 2013-03-01 09:11:58.703316 16.86 mathematics NULL 409 65536 4294967490 46.97 25.92 false fred miller 2013-03-01 09:11:58.703116 33.45 history -59 431 65537 4294967326 11.34 2.9 true oscar robinson 2013-03-01 09:11:58.703161 81.04 zync studies -63 458 65537 4294967463 21.94 49.71 true fred van buren 2013-03-01 09:11:58.703278 99.34 wind surfing -121 355 65537 4294967437 85.9 10.99 true calvin brown 2013-03-01 09:11:58.703254 4.49 yard duty -72 267 65537 4294967460 55.2 42.89 false oscar carson 2013-03-01 09:11:58.703153 51.91 topology -22 264 65537 4294967419 8.07 10.71 false david xylophone 2013-03-01 09:11:58.703136 11.87 undecided -101 283 65538 4294967527 84.03 27.29 true yuri brown 2013-03-01 09:11:58.703306 44.24 biology -109 376 65538 4294967453 59.61 35.62 true priscilla xylophone 2013-03-01 09:11:58.703286 9.53 study skills -83 353 65538 4294967339 0.08 23.91 true holly thompson 2013-03-01 09:11:58.703157 30.27 quiet hour -29 331 65539 4294967420 73.18 28.96 true ethan brown 2013-03-01 09:11:58.703094 58.85 zync studies -70 430 65539 4294967534 18.89 43.84 true tom carson 2013-03-01 09:11:58.703182 21.93 joggying -120 331 65539 4294967324 88.02 40.94 true holly nixon 2013-03-01 09:11:58.703262 96.64 yard duty -71 298 65540 4294967510 91.63 9.6 false gabriella zipper 2013-03-01 09:11:58.70314 68.14 geology -114 385 65541 4294967458 73.48 34.97 true oscar quirinius 2013-03-01 09:11:58.703143 72.33 xylophone band +NULL 473 65720 4294967324 80.74 40.6 false holly falkner 2013-03-01 09:11:58.703111 18.8 mathematics +-3 275 65622 4294967302 71.78 8.49 false wendy robinson 2013-03-01 09:11:58.703294 95.39 undecided +-3 344 65733 4294967363 0.56 11.96 true rachel thompson 2013-03-01 09:11:58.703276 88.46 wind surfing +-3 376 65548 4294967431 96.78 43.23 false fred ellison 2013-03-01 09:11:58.703233 75.39 education +-3 438 65618 4294967398 62.39 4.62 false victor xylophone 2013-03-01 09:11:58.703135 88.38 values clariffication +-3 458 65696 4294967418 45.24 8.49 false irene ellison 2013-03-01 09:11:58.703092 54.02 american history +-3 467 65575 4294967437 81.64 23.53 true tom hernandez 2013-03-01 09:11:58.703188 32.85 study skills +-2 261 65603 4294967332 39.18 28.98 false fred polk 2013-03-01 09:11:58.70331 69.26 opthamology +-2 269 65681 4294967544 99.24 28.19 false rachel falkner 2013-03-01 09:11:58.703089 41.57 quiet hour +-2 288 65658 4294967383 53.78 19.92 false holly nixon 2013-03-01 09:11:58.703224 42.93 industrial engineering +-2 304 65629 4294967386 84.38 33.49 false zach garcia 2013-03-01 09:11:58.703264 56.99 chemistry +-2 340 65627 4294967533 76.52 21.91 true quinn laertes 2013-03-01 09:11:58.703178 93.29 xylophone band +-2 427 65666 4294967465 19.69 33.24 true bob xylophone 2013-03-01 09:11:58.703219 32.73 joggying +-2 429 65664 4294967441 45.19 40.43 false wendy king 2013-03-01 09:11:58.703265 11.46 industrial engineering +-2 461 65648 4294967425 58.52 24.85 false rachel thompson 2013-03-01 09:11:58.703318 85.62 zync studies +-1 268 65778 4294967418 56.33 44.73 true calvin falkner 2013-03-01 09:11:58.70322 7.37 history +-1 281 65643 4294967323 15.1 45.0 false irene nixon 2013-03-01 09:11:58.703223 80.96 undecided +-1 300 65663 4294967343 71.26 34.62 true calvin ovid 2013-03-01 09:11:58.703262 78.56 study skills PREHOOK: query: 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 PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### POSTHOOK: query: 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 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### -17045922556 -PREHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +PREHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +POSTHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -202,14 +202,14 @@ STAGE PLANS: outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10 Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator - key expressions: _col2 (type: int) - sort order: + + key expressions: _col0 (type: tinyint), _col1 (type: smallint), _col2 (type: int) + sort order: +++ Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE - value expressions: _col0 (type: tinyint), _col1 (type: smallint), _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: boolean), _col7 (type: string), _col8 (type: timestamp), _col9 (type: decimal(4,2)), _col10 (type: binary) + value expressions: _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: boolean), _col7 (type: string), _col8 (type: timestamp), _col9 (type: decimal(4,2)), _col10 (type: binary) Execution mode: vectorized Reduce Operator Tree: Select Operator - expressions: VALUE._col0 (type: tinyint), VALUE._col1 (type: smallint), KEY.reducesinkkey0 (type: int), VALUE._col2 (type: bigint), VALUE._col3 (type: float), VALUE._col4 (type: double), VALUE._col5 (type: boolean), VALUE._col6 (type: string), VALUE._col7 (type: timestamp), VALUE._col8 (type: decimal(4,2)), VALUE._col9 (type: binary) + expressions: KEY.reducesinkkey0 (type: tinyint), KEY.reducesinkkey1 (type: smallint), KEY.reducesinkkey2 (type: int), VALUE._col0 (type: bigint), VALUE._col1 (type: float), VALUE._col2 (type: double), VALUE._col3 (type: boolean), VALUE._col4 (type: string), VALUE._col5 (type: timestamp), VALUE._col6 (type: decimal(4,2)), VALUE._col7 (type: binary) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10 Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE Column stats: NONE Limit @@ -229,41 +229,41 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### -POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY i LIMIT 20 +POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### -108 301 65536 4294967357 90.05 17.59 true ethan johnson 2013-03-01 09:11:58.703271 75.7 undecided -118 497 65536 4294967381 50.32 12.72 false david nixon 2013-03-01 09:11:58.703285 83.48 values clariffication -18 280 65536 4294967320 32.92 45.94 false holly white 2013-03-01 09:11:58.703086 58.86 topology -69 489 65536 4294967404 33.52 17.99 false oscar ichabod 2013-03-01 09:11:58.703247 32.68 topology -27 405 65536 4294967508 82.24 29.41 true oscar ovid 2013-03-01 09:11:58.703166 16.85 biology -42 495 65536 4294967431 43.57 46.81 false tom johnson 2013-03-01 09:11:58.703245 62.25 american history +NULL 374 65560 4294967516 65.43 22.48 true oscar quirinius 2013-03-01 09:11:58.703316 16.86 mathematics NULL 409 65536 4294967490 46.97 25.92 false fred miller 2013-03-01 09:11:58.703116 33.45 history -59 431 65537 4294967326 11.34 2.9 true oscar robinson 2013-03-01 09:11:58.703161 81.04 zync studies -63 458 65537 4294967463 21.94 49.71 true fred van buren 2013-03-01 09:11:58.703278 99.34 wind surfing -121 355 65537 4294967437 85.9 10.99 true calvin brown 2013-03-01 09:11:58.703254 4.49 yard duty -72 267 65537 4294967460 55.2 42.89 false oscar carson 2013-03-01 09:11:58.703153 51.91 topology -22 264 65537 4294967419 8.07 10.71 false david xylophone 2013-03-01 09:11:58.703136 11.87 undecided -101 283 65538 4294967527 84.03 27.29 true yuri brown 2013-03-01 09:11:58.703306 44.24 biology -109 376 65538 4294967453 59.61 35.62 true priscilla xylophone 2013-03-01 09:11:58.703286 9.53 study skills -83 353 65538 4294967339 0.08 23.91 true holly thompson 2013-03-01 09:11:58.703157 30.27 quiet hour -29 331 65539 4294967420 73.18 28.96 true ethan brown 2013-03-01 09:11:58.703094 58.85 zync studies -70 430 65539 4294967534 18.89 43.84 true tom carson 2013-03-01 09:11:58.703182 21.93 joggying -120 331 65539 4294967324 88.02 40.94 true holly nixon 2013-03-01 09:11:58.703262 96.64 yard duty -71 298 65540 4294967510 91.63 9.6 false gabriella zipper 2013-03-01 09:11:58.70314 68.14 geology -114 385 65541 4294967458 73.48 34.97 true oscar quirinius 2013-03-01 09:11:58.703143 72.33 xylophone band +NULL 473 65720 4294967324 80.74 40.6 false holly falkner 2013-03-01 09:11:58.703111 18.8 mathematics +-3 275 65622 4294967302 71.78 8.49 false wendy robinson 2013-03-01 09:11:58.703294 95.39 undecided +-3 344 65733 4294967363 0.56 11.96 true rachel thompson 2013-03-01 09:11:58.703276 88.46 wind surfing +-3 376 65548 4294967431 96.78 43.23 false fred ellison 2013-03-01 09:11:58.703233 75.39 education +-3 438 65618 4294967398 62.39 4.62 false victor xylophone 2013-03-01 09:11:58.703135 88.38 values clariffication +-3 458 65696 4294967418 45.24 8.49 false irene ellison 2013-03-01 09:11:58.703092 54.02 american history +-3 467 65575 4294967437 81.64 23.53 true tom hernandez 2013-03-01 09:11:58.703188 32.85 study skills +-2 261 65603 4294967332 39.18 28.98 false fred polk 2013-03-01 09:11:58.70331 69.26 opthamology +-2 269 65681 4294967544 99.24 28.19 false rachel falkner 2013-03-01 09:11:58.703089 41.57 quiet hour +-2 288 65658 4294967383 53.78 19.92 false holly nixon 2013-03-01 09:11:58.703224 42.93 industrial engineering +-2 304 65629 4294967386 84.38 33.49 false zach garcia 2013-03-01 09:11:58.703264 56.99 chemistry +-2 340 65627 4294967533 76.52 21.91 true quinn laertes 2013-03-01 09:11:58.703178 93.29 xylophone band +-2 427 65666 4294967465 19.69 33.24 true bob xylophone 2013-03-01 09:11:58.703219 32.73 joggying +-2 429 65664 4294967441 45.19 40.43 false wendy king 2013-03-01 09:11:58.703265 11.46 industrial engineering +-2 461 65648 4294967425 58.52 24.85 false rachel thompson 2013-03-01 09:11:58.703318 85.62 zync studies +-1 268 65778 4294967418 56.33 44.73 true calvin falkner 2013-03-01 09:11:58.70322 7.37 history +-1 281 65643 4294967323 15.1 45.0 false irene nixon 2013-03-01 09:11:58.703223 80.96 undecided +-1 300 65663 4294967343 71.26 34.62 true calvin ovid 2013-03-01 09:11:58.703262 78.56 study skills PREHOOK: query: 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 PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### POSTHOOK: query: 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 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/vectorization_part_project.q.out b/ql/src/test/results/clientpositive/vectorization_part_project.q.out index 57012b2..f98e79c 100644 --- a/ql/src/test/results/clientpositive/vectorization_part_project.q.out +++ b/ql/src/test/results/clientpositive/vectorization_part_project.q.out @@ -6,11 +6,11 @@ POSTHOOK: query: CREATE TABLE alltypesorc_part(ctinyint tinyint, csmallint small POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@alltypesorc_part -PREHOOK: query: insert overwrite table alltypesorc_part partition (ds='2011') select * from alltypesorc limit 100 +PREHOOK: query: insert overwrite table alltypesorc_part partition (ds='2011') select * from alltypesorc order by ctinyint, cint, cbigint limit 100 PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc PREHOOK: Output: default@alltypesorc_part@ds=2011 -POSTHOOK: query: insert overwrite table alltypesorc_part partition (ds='2011') select * from alltypesorc limit 100 +POSTHOOK: query: insert overwrite table alltypesorc_part partition (ds='2011') select * from alltypesorc order by ctinyint, cint, cbigint limit 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc POSTHOOK: Output: default@alltypesorc_part@ds=2011 @@ -26,11 +26,11 @@ POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring2 SIMPLE [(alltype POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:null), ] POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:null), ] -PREHOOK: query: insert overwrite table alltypesorc_part partition (ds='2012') select * from alltypesorc limit 100 +PREHOOK: query: insert overwrite table alltypesorc_part partition (ds='2012') select * from alltypesorc order by ctinyint, cint, cbigint limit 100 PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc PREHOOK: Output: default@alltypesorc_part@ds=2012 -POSTHOOK: query: insert overwrite table alltypesorc_part partition (ds='2012') select * from alltypesorc limit 100 +POSTHOOK: query: insert overwrite table alltypesorc_part partition (ds='2012') select * from alltypesorc order by ctinyint, cint, cbigint limit 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc POSTHOOK: Output: default@alltypesorc_part@ds=2012 @@ -60,27 +60,27 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc_part - Statistics: Num rows: 200 Data size: 41576 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 200 Data size: 54496 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (cdouble + 2.0) (type: double) outputColumnNames: _col0 - Statistics: Num rows: 200 Data size: 41576 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 200 Data size: 54496 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: double) sort order: + - Statistics: Num rows: 200 Data size: 41576 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 200 Data size: 54496 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: double) outputColumnNames: _col0 - Statistics: Num rows: 200 Data size: 41576 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 200 Data size: 54496 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 10 - Statistics: Num rows: 10 Data size: 2070 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 2720 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 10 Data size: 2070 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 10 Data size: 2720 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -104,13 +104,13 @@ POSTHOOK: Input: default@alltypesorc_part POSTHOOK: Input: default@alltypesorc_part@ds=2011 POSTHOOK: Input: default@alltypesorc_part@ds=2012 #### A masked pattern was here #### --15910.0 --15910.0 --15811.0 --15811.0 --15788.0 --15788.0 --15547.0 --15547.0 --15429.0 --15429.0 +NULL +NULL +-15863.0 +-15863.0 +-14988.0 +-14988.0 +-14646.0 +-14646.0 +-14236.0 +-14236.0 diff --git a/ql/src/test/results/clientpositive/vectorized_distinct_gby.q.out b/ql/src/test/results/clientpositive/vectorized_distinct_gby.q.out index 1c684ce..2e041a3 100644 --- a/ql/src/test/results/clientpositive/vectorized_distinct_gby.q.out +++ b/ql/src/test/results/clientpositive/vectorized_distinct_gby.q.out @@ -6,11 +6,11 @@ POSTHOOK: query: create table dtest(a int, b int) clustered by (a) sorted by (a) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dtest -PREHOOK: query: 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 +PREHOOK: query: 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 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@dtest -POSTHOOK: query: 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 +POSTHOOK: query: 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 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@dtest diff --git a/ql/src/test/results/clientpositive/vectorized_mapjoin.q.out b/ql/src/test/results/clientpositive/vectorized_mapjoin.q.out index d042ae0..ec428e7 100644 --- a/ql/src/test/results/clientpositive/vectorized_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/vectorized_mapjoin.q.out @@ -1,8 +1,10 @@ -PREHOOK: query: EXPLAIN SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) +PREHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) FROM alltypesorc t1 JOIN alltypesorc t2 ON t1.cint = t2.cint PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) +POSTHOOK: query: -- SORT_QUERY_RESULTS +EXPLAIN SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) FROM alltypesorc t1 JOIN alltypesorc t2 ON t1.cint = t2.cint POSTHOOK: type: QUERY @@ -92,13 +94,15 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) +PREHOOK: query: -- SORT_QUERY_RESULTS +SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) FROM alltypesorc t1 JOIN alltypesorc t2 ON t1.cint = t2.cint PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc #### A masked pattern was here #### -POSTHOOK: query: SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) +POSTHOOK: query: -- SORT_QUERY_RESULTS +SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) FROM alltypesorc t1 JOIN alltypesorc t2 ON t1.cint = t2.cint POSTHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/vectorized_nested_mapjoin.q.out b/ql/src/test/results/clientpositive/vectorized_nested_mapjoin.q.out index c92dcf9..dd345ba 100644 --- a/ql/src/test/results/clientpositive/vectorized_nested_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/vectorized_nested_mapjoin.q.out @@ -1,6 +1,8 @@ -PREHOOK: query: explain select sum(t1.td) from (select v1.csmallint as tsi, v1.cdouble as td from alltypesorc v1, alltypesorc v2 where v1.ctinyint=v2.ctinyint) t1 join alltypesorc v3 on t1.tsi=v3.csmallint +PREHOOK: query: -- SORT_QUERY_RESULTS +explain select sum(t1.td) from (select v1.csmallint as tsi, v1.cdouble as td from alltypesorc v1, alltypesorc v2 where v1.ctinyint=v2.ctinyint) t1 join alltypesorc v3 on t1.tsi=v3.csmallint PREHOOK: type: QUERY -POSTHOOK: query: explain select sum(t1.td) from (select v1.csmallint as tsi, v1.cdouble as td from alltypesorc v1, alltypesorc v2 where v1.ctinyint=v2.ctinyint) t1 join alltypesorc v3 on t1.tsi=v3.csmallint +POSTHOOK: query: -- SORT_QUERY_RESULTS +explain select sum(t1.td) from (select v1.csmallint as tsi, v1.cdouble as td from alltypesorc v1, alltypesorc v2 where v1.ctinyint=v2.ctinyint) t1 join alltypesorc v3 on t1.tsi=v3.csmallint POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-8 is a root stage @@ -118,11 +120,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select sum(t1.td) from (select v1.csmallint as tsi, v1.cdouble as td from alltypesorc v1, alltypesorc v2 where v1.ctinyint=v2.ctinyint) t1 join alltypesorc v3 on t1.tsi=v3.csmallint +PREHOOK: query: -- SORT_QUERY_RESULTS +select sum(t1.td) from (select v1.csmallint as tsi, v1.cdouble as td from alltypesorc v1, alltypesorc v2 where v1.ctinyint=v2.ctinyint) t1 join alltypesorc v3 on t1.tsi=v3.csmallint PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc #### A masked pattern was here #### -POSTHOOK: query: select sum(t1.td) from (select v1.csmallint as tsi, v1.cdouble as td from alltypesorc v1, alltypesorc v2 where v1.ctinyint=v2.ctinyint) t1 join alltypesorc v3 on t1.tsi=v3.csmallint +POSTHOOK: query: -- SORT_QUERY_RESULTS +select sum(t1.td) from (select v1.csmallint as tsi, v1.cdouble as td from alltypesorc v1, alltypesorc v2 where v1.ctinyint=v2.ctinyint) t1 join alltypesorc v3 on t1.tsi=v3.csmallint POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/vectorized_rcfile_columnar.q.out b/ql/src/test/results/clientpositive/vectorized_rcfile_columnar.q.out index ee8959b..c35173e 100644 --- a/ql/src/test/results/clientpositive/vectorized_rcfile_columnar.q.out +++ b/ql/src/test/results/clientpositive/vectorized_rcfile_columnar.q.out @@ -23,12 +23,12 @@ POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@columnTable PREHOOK: query: 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 PREHOOK: type: QUERY PREHOOK: Input: default@src PREHOOK: Output: default@columntable POSTHOOK: query: 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 POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: default@columntable @@ -50,13 +50,13 @@ POSTHOOK: query: SELECT key, value FROM columnTable ORDER BY key POSTHOOK: type: QUERY POSTHOOK: Input: default@columntable #### A masked pattern was here #### -165 val_165 -238 val_238 -255 val_255 -27 val_27 -278 val_278 -311 val_311 -409 val_409 -484 val_484 -86 val_86 -98 val_98 +0 val_0 +0 val_0 +0 val_0 +10 val_10 +100 val_100 +100 val_100 +103 val_103 +103 val_103 +104 val_104 +104 val_104 diff --git a/ql/src/test/results/clientpositive/vectorized_shufflejoin.q.out b/ql/src/test/results/clientpositive/vectorized_shufflejoin.q.out index 959a762..0f043e8 100644 --- a/ql/src/test/results/clientpositive/vectorized_shufflejoin.q.out +++ b/ql/src/test/results/clientpositive/vectorized_shufflejoin.q.out @@ -1,15 +1,16 @@ -PREHOOK: query: EXPLAIN SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) +PREHOOK: query: 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 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) +POSTHOOK: query: 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 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage Stage-2 depends on stages: Stage-1 - Stage-0 depends on stages: Stage-2 + Stage-3 depends on stages: Stage-2 + Stage-0 depends on stages: Stage-3 STAGE PLANS: Stage: Stage-1 @@ -86,6 +87,27 @@ STAGE PLANS: Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false + table: + input format: org.apache.hadoop.mapred.SequenceFileInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe + + Stage: Stage-3 + Map Reduce + Map Operator Tree: + TableScan + Reduce Output Operator + key expressions: _col0 (type: bigint) + sort order: + + Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: int), _col2 (type: int), _col3 (type: double) + Reduce Operator Tree: + Select Operator + expressions: KEY.reducesinkkey0 (type: bigint), VALUE._col0 (type: int), VALUE._col1 (type: int), VALUE._col2 (type: double) + outputColumnNames: _col0, _col1, _col2, _col3 + Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE + File Output Operator + compressed: false Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat @@ -98,15 +120,15 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) +PREHOOK: query: 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 + JOIN alltypesorc t2 ON t1.cint = t2.cint order by CNT PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc #### A masked pattern was here #### -POSTHOOK: query: SELECT COUNT(t1.cint), MAX(t2.cint), MIN(t1.cint), AVG(t1.cint+t2.cint) +POSTHOOK: query: 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 + JOIN alltypesorc t2 ON t1.cint = t2.cint order by CNT POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out b/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out index 31a96c6..1fcee3e 100644 --- a/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out +++ b/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out @@ -18,18 +18,20 @@ POSTHOOK: Output: database:default POSTHOOK: Output: default@alltypesorc_string PREHOOK: query: 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 PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc PREHOOK: Output: default@alltypesorc_string POSTHOOK: query: 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 POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc @@ -107,25 +109,25 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc_string - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: to_unix_timestamp(ctimestamp1) (type: bigint), year(ctimestamp1) (type: int), month(ctimestamp1) (type: int), day(ctimestamp1) (type: int), dayofmonth(ctimestamp1) (type: int), weekofyear(ctimestamp1) (type: int), hour(ctimestamp1) (type: int), minute(ctimestamp1) (type: int), second(ctimestamp1) (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8 - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: bigint) sort order: + - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col7 (type: int), _col8 (type: int) Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: bigint), VALUE._col0 (type: int), VALUE._col1 (type: int), VALUE._col2 (type: int), VALUE._col3 (type: int), VALUE._col4 (type: int), VALUE._col5 (type: int), VALUE._col6 (type: int), VALUE._col7 (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8 - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -168,45 +170,45 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc_string #### A masked pattern was here #### NULL NULL NULL NULL NULL NULL NULL NULL NULL -28784 1969 12 31 31 1 23 59 44 -28784 1969 12 31 31 1 23 59 44 -28784 1969 12 31 31 1 23 59 44 -28784 1969 12 31 31 1 23 59 44 -28785 1969 12 31 31 1 23 59 45 -28786 1969 12 31 31 1 23 59 46 -28787 1969 12 31 31 1 23 59 47 -28788 1969 12 31 31 1 23 59 48 -28789 1969 12 31 31 1 23 59 49 -28789 1969 12 31 31 1 23 59 49 -28790 1969 12 31 31 1 23 59 50 -28792 1969 12 31 31 1 23 59 52 -28792 1969 12 31 31 1 23 59 52 -28792 1969 12 31 31 1 23 59 52 -28792 1969 12 31 31 1 23 59 52 -28795 1969 12 31 31 1 23 59 55 -28795 1969 12 31 31 1 23 59 55 -28795 1969 12 31 31 1 23 59 55 -28798 1969 12 31 31 1 23 59 58 -28798 1969 12 31 31 1 23 59 58 -28800 1970 1 1 1 1 0 0 0 -28800 1970 1 1 1 1 0 0 0 -28802 1970 1 1 1 1 0 0 2 -28803 1970 1 1 1 1 0 0 3 -28804 1970 1 1 1 1 0 0 4 -28804 1970 1 1 1 1 0 0 4 -28805 1970 1 1 1 1 0 0 5 -28805 1970 1 1 1 1 0 0 5 -28806 1970 1 1 1 1 0 0 6 -28807 1970 1 1 1 1 0 0 7 -28807 1970 1 1 1 1 0 0 7 -28807 1970 1 1 1 1 0 0 7 -28808 1970 1 1 1 1 0 0 8 -28808 1970 1 1 1 1 0 0 8 -28809 1970 1 1 1 1 0 0 9 -28811 1970 1 1 1 1 0 0 11 -28813 1970 1 1 1 1 0 0 13 -28814 1970 1 1 1 1 0 0 14 -28815 1970 1 1 1 1 0 0 15 +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL PREHOOK: query: EXPLAIN SELECT to_unix_timestamp(stimestamp1) AS c1, year(stimestamp1), @@ -243,25 +245,25 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc_string - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: to_unix_timestamp(stimestamp1) (type: bigint), year(stimestamp1) (type: int), month(stimestamp1) (type: int), day(stimestamp1) (type: int), dayofmonth(stimestamp1) (type: int), weekofyear(stimestamp1) (type: int), hour(stimestamp1) (type: int), minute(stimestamp1) (type: int), second(stimestamp1) (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8 - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: bigint) sort order: + - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col7 (type: int), _col8 (type: int) Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: bigint), VALUE._col0 (type: int), VALUE._col1 (type: int), VALUE._col2 (type: int), VALUE._col3 (type: int), VALUE._col4 (type: int), VALUE._col5 (type: int), VALUE._col6 (type: int), VALUE._col7 (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8 - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -304,45 +306,45 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc_string #### A masked pattern was here #### NULL NULL NULL NULL NULL NULL NULL NULL NULL -28784 1969 12 31 31 1 23 59 44 -28784 1969 12 31 31 1 23 59 44 -28784 1969 12 31 31 1 23 59 44 -28784 1969 12 31 31 1 23 59 44 -28785 1969 12 31 31 1 23 59 45 -28786 1969 12 31 31 1 23 59 46 -28787 1969 12 31 31 1 23 59 47 -28788 1969 12 31 31 1 23 59 48 -28789 1969 12 31 31 1 23 59 49 -28789 1969 12 31 31 1 23 59 49 -28790 1969 12 31 31 1 23 59 50 -28792 1969 12 31 31 1 23 59 52 -28792 1969 12 31 31 1 23 59 52 -28792 1969 12 31 31 1 23 59 52 -28792 1969 12 31 31 1 23 59 52 -28795 1969 12 31 31 1 23 59 55 -28795 1969 12 31 31 1 23 59 55 -28795 1969 12 31 31 1 23 59 55 -28798 1969 12 31 31 1 23 59 58 -28798 1969 12 31 31 1 23 59 58 -28800 1970 1 1 1 1 0 0 0 -28800 1970 1 1 1 1 0 0 0 -28802 1970 1 1 1 1 0 0 2 -28803 1970 1 1 1 1 0 0 3 -28804 1970 1 1 1 1 0 0 4 -28804 1970 1 1 1 1 0 0 4 -28805 1970 1 1 1 1 0 0 5 -28805 1970 1 1 1 1 0 0 5 -28806 1970 1 1 1 1 0 0 6 -28807 1970 1 1 1 1 0 0 7 -28807 1970 1 1 1 1 0 0 7 -28807 1970 1 1 1 1 0 0 7 -28808 1970 1 1 1 1 0 0 8 -28808 1970 1 1 1 1 0 0 8 -28809 1970 1 1 1 1 0 0 9 -28811 1970 1 1 1 1 0 0 11 -28813 1970 1 1 1 1 0 0 13 -28814 1970 1 1 1 1 0 0 14 -28815 1970 1 1 1 1 0 0 15 +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL PREHOOK: query: EXPLAIN SELECT to_unix_timestamp(ctimestamp1) = to_unix_timestamp(stimestamp1) AS c1, year(ctimestamp1) = year(stimestamp1), @@ -379,25 +381,25 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc_string - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (to_unix_timestamp(ctimestamp1) = to_unix_timestamp(stimestamp1)) (type: boolean), (year(ctimestamp1) = year(stimestamp1)) (type: boolean), (month(ctimestamp1) = month(stimestamp1)) (type: boolean), (day(ctimestamp1) = day(stimestamp1)) (type: boolean), (dayofmonth(ctimestamp1) = dayofmonth(stimestamp1)) (type: boolean), (weekofyear(ctimestamp1) = weekofyear(stimestamp1)) (type: boolean), (hour(ctimestamp1) = hour(stimestamp1)) (type: boolean), (minute(ctimestamp1) = minute(stimestamp1)) (type: boolean), (second(ctimestamp1) = second(stimestamp1)) (type: boolean) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8 - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: boolean) sort order: + - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE value expressions: _col1 (type: boolean), _col2 (type: boolean), _col3 (type: boolean), _col4 (type: boolean), _col5 (type: boolean), _col6 (type: boolean), _col7 (type: boolean), _col8 (type: boolean) Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: boolean), VALUE._col0 (type: boolean), VALUE._col1 (type: boolean), VALUE._col2 (type: boolean), VALUE._col3 (type: boolean), VALUE._col4 (type: boolean), VALUE._col5 (type: boolean), VALUE._col6 (type: boolean), VALUE._col7 (type: boolean) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8 - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -442,45 +444,45 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc_string #### A masked pattern was here #### NULL NULL NULL NULL NULL NULL NULL NULL NULL -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true -true true true true true true true true true +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL +NULL NULL NULL NULL NULL NULL NULL NULL NULL PREHOOK: query: -- Wrong format. Should all be NULL. EXPLAIN SELECT to_unix_timestamp(stimestamp1) AS c1, @@ -606,11 +608,11 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc_string - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctimestamp1 (type: timestamp) outputColumnNames: _col0 - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: min(_col0), max(_col0), count(_col0), count() mode: hash @@ -659,7 +661,7 @@ FROM alltypesorc_string POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc_string #### A masked pattern was here #### -1969-12-31 23:59:44.088 1970-01-01 00:00:15.007 39 40 +NULL NULL 0 40 PREHOOK: query: -- SUM of timestamps are not vectorized reduce-side because they produce a double instead of a long (HIVE-8211)... EXPLAIN SELECT sum(ctimestamp1) @@ -680,11 +682,11 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc_string - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctimestamp1 (type: timestamp) outputColumnNames: _col0 - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: sum(_col0) mode: hash @@ -726,7 +728,7 @@ FROM alltypesorc_string POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc_string #### A masked pattern was here #### -1123143.8569999998 +NULL PREHOOK: query: EXPLAIN SELECT avg(ctimestamp1), variance(ctimestamp1), @@ -759,11 +761,11 @@ STAGE PLANS: Map Operator Tree: TableScan alias: alltypesorc_string - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctimestamp1 (type: timestamp) outputColumnNames: _col0 - Statistics: Num rows: 40 Data size: 5694 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 40 Data size: 84 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: avg(_col0), variance(_col0), var_pop(_col0), var_samp(_col0), std(_col0), stddev(_col0), stddev_pop(_col0), stddev_samp(_col0) mode: hash @@ -820,4 +822,4 @@ FROM alltypesorc_string POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc_string #### A masked pattern was here #### -2.8798560435897438E13 8.970772952794212E19 8.970772952794212E19 9.206845925236166E19 9.471416447815084E9 9.471416447815084E9 9.471416447815084E9 9.595231068211002E9 +NULL NULL NULL NULL NULL NULL NULL NULL