From b9914d6bcd0a20e7f6257097178c4b6501dfa85b Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Sun, 5 Aug 2018 09:19:49 +0300 Subject: [PATCH] Revert "Updated tests #2094" This reverts commit 47554229c0802b883087b00d352445ffce30168a. --- ..._summing_merge_tree_aggregate_function.sql | 32 +++++++++---------- .../00225_join_duplicate_columns.reference | 3 ++ .../00225_join_duplicate_columns.sql | 9 ++++++ ..._duplicate_columns_in_subqueries.reference | 12 +++++++ .../00370_duplicate_columns_in_subqueries.sql | 12 +++++++ .../00556_remove_columns_from_subquery.sql | 4 +-- .../00577_full_join_segfault.reference | 8 +++++ .../0_stateless/00577_full_join_segfault.sql | 7 ++++ 8 files changed, 69 insertions(+), 18 deletions(-) create mode 100644 dbms/tests/queries/0_stateless/00225_join_duplicate_columns.reference create mode 100644 dbms/tests/queries/0_stateless/00225_join_duplicate_columns.sql create mode 100644 dbms/tests/queries/0_stateless/00370_duplicate_columns_in_subqueries.reference create mode 100644 dbms/tests/queries/0_stateless/00370_duplicate_columns_in_subqueries.sql create mode 100644 dbms/tests/queries/0_stateless/00577_full_join_segfault.reference create mode 100644 dbms/tests/queries/0_stateless/00577_full_join_segfault.sql diff --git a/dbms/tests/queries/0_stateless/00148_summing_merge_tree_aggregate_function.sql b/dbms/tests/queries/0_stateless/00148_summing_merge_tree_aggregate_function.sql index f4feba4cbb7..71068e0f74f 100644 --- a/dbms/tests/queries/0_stateless/00148_summing_merge_tree_aggregate_function.sql +++ b/dbms/tests/queries/0_stateless/00148_summing_merge_tree_aggregate_function.sql @@ -3,9 +3,9 @@ drop table if exists test.summing_merge_tree_null; ---- partition merge create table test.summing_merge_tree_aggregate_function ( - d Date, - k UInt64, - u AggregateFunction(uniq, UInt64) + d Date, + k UInt64, + u AggregateFunction(uniq, UInt64) ) engine=SummingMergeTree(d, k, 1); insert into test.summing_merge_tree_aggregate_function @@ -30,11 +30,11 @@ drop table test.summing_merge_tree_aggregate_function; ---- sum + uniq + uniqExact create table test.summing_merge_tree_aggregate_function ( - d materialized today(), - k UInt64, - c UInt64, - u AggregateFunction(uniq, UInt8), - ue AggregateFunction(uniqExact, UInt8) + d materialized today(), + k UInt64, + c UInt64, + u AggregateFunction(uniq, UInt8), + ue AggregateFunction(uniqExact, UInt8) ) engine=SummingMergeTree(d, k, 8192); insert into test.summing_merge_tree_aggregate_function select 1, 1, uniqState(1), uniqExactState(1); @@ -45,15 +45,15 @@ insert into test.summing_merge_tree_aggregate_function select 1, 1, uniqState(2) insert into test.summing_merge_tree_aggregate_function select 1, 1, uniqState(3), uniqExactState(3); select - k, sum(c), - uniqMerge(u), uniqExactMerge(ue) + k, sum(c), + uniqMerge(u), uniqExactMerge(ue) from test.summing_merge_tree_aggregate_function group by k; optimize table test.summing_merge_tree_aggregate_function; select - k, sum(c), - uniqMerge(u), uniqExactMerge(ue) + k, sum(c), + uniqMerge(u), uniqExactMerge(ue) from test.summing_merge_tree_aggregate_function group by k; drop table test.summing_merge_tree_aggregate_function; @@ -122,10 +122,10 @@ create table test.summing_merge_tree_null ( ) engine=Null; create materialized view test.summing_merge_tree_aggregate_function ( - d materialized today(), - k UInt64, - c UInt64, - u AggregateFunction(uniq, UInt64) + d materialized today(), + k UInt64, + c UInt64, + u AggregateFunction(uniq, UInt64) ) engine=SummingMergeTree(d, k, 8192) as select d, k, sum(c) as c, uniqState(u) as u from test.summing_merge_tree_null diff --git a/dbms/tests/queries/0_stateless/00225_join_duplicate_columns.reference b/dbms/tests/queries/0_stateless/00225_join_duplicate_columns.reference new file mode 100644 index 00000000000..53ec3ef6d56 --- /dev/null +++ b/dbms/tests/queries/0_stateless/00225_join_duplicate_columns.reference @@ -0,0 +1,3 @@ +0 +2 +42 1 1 0 0 diff --git a/dbms/tests/queries/0_stateless/00225_join_duplicate_columns.sql b/dbms/tests/queries/0_stateless/00225_join_duplicate_columns.sql new file mode 100644 index 00000000000..b4e02c153d5 --- /dev/null +++ b/dbms/tests/queries/0_stateless/00225_join_duplicate_columns.sql @@ -0,0 +1,9 @@ +select b from (select 1 as a, 42 as c) any left join (select 2 as b, 2 as b, 41 as c) using c; +select b from (select 1 as a, 42 as c) any left join (select 2 as b, 2 as b, 42 as c) using c; + +select c,a,a,b,b from + (select 1 as a, 1 as a, 42 as c group by c order by a,c) + any left join + (select 2 as b, 2 as b, 41 as c group by c order by b,c) + using c + order by b; diff --git a/dbms/tests/queries/0_stateless/00370_duplicate_columns_in_subqueries.reference b/dbms/tests/queries/0_stateless/00370_duplicate_columns_in_subqueries.reference new file mode 100644 index 00000000000..301032e5f43 --- /dev/null +++ b/dbms/tests/queries/0_stateless/00370_duplicate_columns_in_subqueries.reference @@ -0,0 +1,12 @@ +1 2 +1 1 +1 +1 2 +1 1 1 +1 1 +1 1 +1 1 +42 1 2 +42 1 2 +0 hello world +1 hello world diff --git a/dbms/tests/queries/0_stateless/00370_duplicate_columns_in_subqueries.sql b/dbms/tests/queries/0_stateless/00370_duplicate_columns_in_subqueries.sql new file mode 100644 index 00000000000..44506d772a3 --- /dev/null +++ b/dbms/tests/queries/0_stateless/00370_duplicate_columns_in_subqueries.sql @@ -0,0 +1,12 @@ +select x, y from (select 1 as x, 2 as y, x, y); +select x, y from (select 1 as x, 1 as y, x, y); +select x from (select 1 as x, 1 as y, x, y); +select * from (select 1 as x, 2 as y, x, y); +select * from (select 1 as a, 1 as b, 1 as c, b, c); +select b, c from (select 1 as a, 1 as b, 1 as c, b, c); +select b, c from (select 1 as a, 1 as b, 1 as c, b, c) any left join (select 1 as a) using a; +select b, c from (select 1 as a, 1 as b, 1 as c, 1 as b, 1 as c) any left join (select 1 as a) using a; +select a, b, c from (select 42 as a, 1 as b, 2 as c, 1 as b, 2 as c) any left join (select 42 as a, 3 as d) using a; +select a, b, c from (select 42 as a, 1 as b, 2 as c, 1 as b, 2 as c) any left join (select 42 as a, 3 as d) using a order by d; + +SELECT k, a1, b1, a2, b2 FROM (SELECT 0 AS k, 'hello' AS a1, 'world' AS b1, a1) ANY FULL OUTER JOIN (SELECT 1 AS k, 'hello' AS a2, 'world' AS b2, a2) USING (k) ORDER BY k; diff --git a/dbms/tests/queries/0_stateless/00556_remove_columns_from_subquery.sql b/dbms/tests/queries/0_stateless/00556_remove_columns_from_subquery.sql index fd10e4d40e5..cfe47981e30 100644 --- a/dbms/tests/queries/0_stateless/00556_remove_columns_from_subquery.sql +++ b/dbms/tests/queries/0_stateless/00556_remove_columns_from_subquery.sql @@ -2,5 +2,5 @@ SELECT a FROM (SELECT 1 AS a, 2 AS b); SELECT a FROM (SELECT 1 AS a, arrayJoin([2, 3]) AS b); SELECT a FROM (SELECT 1 AS a, arrayJoin([2, 3]), arrayJoin([2, 3])); SELECT a FROM (SELECT 1 AS a, arrayJoin([2, 3]), arrayJoin([4, 5])); -SELECT a, b FROM (SELECT a, * FROM (SELECT 1 AS a, 2 AS b, 3 AS c)); -- { serverError 15 } -SELECT a, b FROM (SELECT a, *, arrayJoin(c) FROM (SELECT 1 AS a, 2 AS b, [3, 4] AS c)); -- { serverError 15 } +SELECT a, b FROM (SELECT a, * FROM (SELECT 1 AS a, 2 AS b, 3 AS c)); +SELECT a, b FROM (SELECT a, *, arrayJoin(c) FROM (SELECT 1 AS a, 2 AS b, [3, 4] AS c)); diff --git a/dbms/tests/queries/0_stateless/00577_full_join_segfault.reference b/dbms/tests/queries/0_stateless/00577_full_join_segfault.reference new file mode 100644 index 00000000000..e91c16f7902 --- /dev/null +++ b/dbms/tests/queries/0_stateless/00577_full_join_segfault.reference @@ -0,0 +1,8 @@ +0 hello 123 0 +1 0 hello 456 +0 hello 123 +1 0 +0 hello 123 \N \N +1 \N \N hello 456 +0 hello 123 +1 \N \N diff --git a/dbms/tests/queries/0_stateless/00577_full_join_segfault.sql b/dbms/tests/queries/0_stateless/00577_full_join_segfault.sql new file mode 100644 index 00000000000..a53c9ffe4eb --- /dev/null +++ b/dbms/tests/queries/0_stateless/00577_full_join_segfault.sql @@ -0,0 +1,7 @@ +SELECT k, a1, b1, a2, b2 FROM (SELECT 0 AS k, 'hello' AS a1, 123 AS b1, a1) ANY FULL OUTER JOIN (SELECT 1 AS k, 'hello' AS a2, 456 AS b2, a2) USING (k) ORDER BY k; +SELECT k, a, b FROM (SELECT 0 AS k, 'hello' AS a, 123 AS b, a) ANY FULL OUTER JOIN (SELECT 1 AS k) USING (k) ORDER BY k; + +SET join_use_nulls = 1; + +SELECT k, a1, b1, a2, b2 FROM (SELECT 0 AS k, 'hello' AS a1, 123 AS b1, a1) ANY FULL OUTER JOIN (SELECT 1 AS k, 'hello' AS a2, 456 AS b2, a2) USING (k) ORDER BY k; +SELECT k, a, b FROM (SELECT 0 AS k, 'hello' AS a, 123 AS b, a) ANY FULL OUTER JOIN (SELECT 1 AS k) USING (k) ORDER BY k;