Skip to content

Commit 1cffe42

Browse files
fm4vfm4v
authored
Merge pull request ClickHouse#80593 from ClickHouse/parallel-replicas-replace-log-memory
Stateless tests: fix flaky tests in parallel replicas job
2 parents 81dce1e + 57d68a7 commit 1cffe42

9 files changed

+33
-29
lines changed

‎tests/queries/0_stateless/00937_test_use_header_tsv.reference‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
1970-01-01 0
2+
1970-01-01 0
3+
1970-01-01 1 Line16
4+
1970-01-01 2 Line17
5+
2019-04-18 0 Line18
6+
2019-04-18 0 Line19
7+
2019-04-18 1
8+
2019-04-18 1 Line10
9+
2019-04-18 1 Line12
10+
2019-04-18 2
11+
2019-04-18 2 Line11
12+
2019-04-18 2 Line13
113
2019-04-18 42 Line1
214
2019-04-18 42 Line2
315
2019-04-18 42 Line3
@@ -7,15 +19,3 @@
719
2019-04-18 42 Line7
820
2019-04-18 42 Line8
921
2019-04-18 42 Line9
10-
2019-04-18 1 Line10
11-
2019-04-18 2 Line11
12-
2019-04-18 1 Line12
13-
2019-04-18 2 Line13
14-
2019-04-18 1
15-
2019-04-18 2
16-
1970-01-01 1 Line16
17-
1970-01-01 2 Line17
18-
2019-04-18 0 Line18
19-
2019-04-18 0 Line19
20-
1970-01-01 0
21-
1970-01-01 0

‎tests/queries/0_stateless/00937_test_use_header_tsv.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ echo -ne 'str\tu\nLine16\t1\nLine17\t2\n' | eval "$INSERT_QUERY
3434
echo -ne 'd\tstr\n2019-04-18\tLine18\n2019-04-18\tLine19\n'| eval "$INSERT_QUERY" $USE_HEADER
3535
echo -ne 'unknown\n\n\n' | eval "$INSERT_QUERY" $USE_HEADER $SKIP_UNKNOWN
3636

37-
$CLICKHOUSE_CLIENT --query="SELECT * FROM tsv"
37+
$CLICKHOUSE_CLIENT --query="SELECT * FROM tsv ORDER BY ALL"
3838
$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS tsv"

‎tests/queries/0_stateless/01825_type_json_10.sql‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
-- Tags: no-fasttest
1+
-- Tags: no-fasttest, no-parallel-replicas
2+
-- no-parallel-replicas: some logical error with Object(json)
23

34
SET allow_experimental_object_type = 1;
45
SET output_format_json_named_tuples_as_objects = 1;

‎tests/queries/0_stateless/02481_parquet_int_list_multiple_chunks.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
2-
# Tags: no-ubsan, no-fasttest
3-
2+
# Tags: no-ubsan, no-fasttest, no-parallel-replicas
3+
# no-parallel-replicas: ORDER BY ALL is missing, but this test doesn't add additional value with parallel replicas enabled, so skip it
44
CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
55
# shellcheck source=../shell_config.sh
66
. "$CUR_DIR"/../shell_config.sh
@@ -39,4 +39,4 @@ ${CLICKHOUSE_CLIENT} --query="CREATE TABLE parquet_load (arr Array(Int64)) ENGIN
3939
cat "$DATA_FILE" | ${CLICKHOUSE_CLIENT} -q "INSERT INTO parquet_load FORMAT Parquet"
4040
${CLICKHOUSE_CLIENT} --query="SELECT * FROM parquet_load SETTINGS max_threads=1" | md5sum
4141
${CLICKHOUSE_CLIENT} --query="SELECT count() FROM parquet_load"
42-
${CLICKHOUSE_CLIENT} --query="drop table parquet_load"
42+
${CLICKHOUSE_CLIENT} --query="drop table parquet_load"

‎tests/queries/0_stateless/02572_query_views_log_background_thread.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/usr/bin/env bash
2+
# Tags: no-parallel-replicas
3+
# no-parallel-replicas: unrelated error
24

35
# INSERT buffer_02572 -> data_02572 -> copy_02572
46
# ^^

‎tests/queries/0_stateless/02840_merge__table_or_filter.reference‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
-- { echoOn }
22

3-
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v1') settings enable_analyzer=0, convert_query_to_cnf=0;
3+
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v1') ORDER BY ALL settings enable_analyzer=0, convert_query_to_cnf=0;
44
v1 1
55
v1 2
6-
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v2') settings enable_analyzer=0, convert_query_to_cnf=0;
6+
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v2') ORDER BY ALL settings enable_analyzer=0, convert_query_to_cnf=0;
77
v1 1
88
v2 2
99
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v3') settings enable_analyzer=0, convert_query_to_cnf=0;
1010
v1 1
1111
select _table, key from m where (value = 10 and _table = 'v3') or (value = 20 and _table = 'v3') settings enable_analyzer=0, convert_query_to_cnf=0;
12-
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v1') settings enable_analyzer=0, convert_query_to_cnf=1;
12+
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v1') ORDER BY ALL settings enable_analyzer=0, convert_query_to_cnf=1;
1313
v1 1
1414
v1 2
15-
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v2') settings enable_analyzer=0, convert_query_to_cnf=1;
15+
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v2') ORDER BY ALL settings enable_analyzer=0, convert_query_to_cnf=1;
1616
v1 1
1717
v2 2
1818
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v3') settings enable_analyzer=0, convert_query_to_cnf=1;
1919
v1 1
2020
select _table, key from m where (value = 10 and _table = 'v3') or (value = 20 and _table = 'v3') settings enable_analyzer=0, convert_query_to_cnf=1;
21-
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v1') settings enable_analyzer=1, convert_query_to_cnf=0;
21+
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v1') ORDER BY ALL settings enable_analyzer=1, convert_query_to_cnf=0;
2222
v1 1
2323
v1 2
24-
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v2') settings enable_analyzer=1, convert_query_to_cnf=0;
24+
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v2') ORDER BY ALL settings enable_analyzer=1, convert_query_to_cnf=0;
2525
v1 1
2626
v2 2
2727
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v3') settings enable_analyzer=1, convert_query_to_cnf=0;
2828
v1 1
2929
select _table, key from m where (value = 10 and _table = 'v3') or (value = 20 and _table = 'v3') settings enable_analyzer=1, convert_query_to_cnf=0;
30-
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v1') settings enable_analyzer=1, convert_query_to_cnf=1;
30+
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v1') ORDER BY ALL settings enable_analyzer=1, convert_query_to_cnf=1;
3131
v1 1
3232
v1 2
33-
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v2') settings enable_analyzer=1, convert_query_to_cnf=1;
33+
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v2') ORDER BY ALL settings enable_analyzer=1, convert_query_to_cnf=1;
3434
v1 1
3535
v2 2
3636
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v3') settings enable_analyzer=1, convert_query_to_cnf=1;

‎tests/queries/0_stateless/02840_merge__table_or_filter.sql.j2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ set max_threads=1;
3232
'enable_analyzer=1, convert_query_to_cnf=0',
3333
'enable_analyzer=1, convert_query_to_cnf=1'
3434
] %}
35-
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v1') settings {{ settings }};
36-
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v2') settings {{ settings }};
35+
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v1') ORDER BY ALL settings {{ settings }};
36+
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v2') ORDER BY ALL settings {{ settings }};
3737
select _table, key from m where (value = 10 and _table = 'v1') or (value = 20 and _table = 'v3') settings {{ settings }};
3838
select _table, key from m where (value = 10 and _table = 'v3') or (value = 20 and _table = 'v3') settings {{ settings }};
3939
{% endfor %}

‎tests/queries/0_stateless/03142_window_function_limit_by.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ SELECT
2020
FROM error_win_func
2121
WINDOW
2222
w AS (ROWS BETWEEN CURRENT ROW AND 3 FOLLOWING)
23+
ORDER BY ALL
2324
LIMIT 1 BY
2425
k;
2526

@@ -35,6 +36,7 @@ SELECT
3536
count() OVER (PARTITION BY m) cnt
3637
FROM t
3738
WHERE st IN ('x', 'y')
39+
ORDER BY ALL
3840
LIMIT 1 BY m;
3941

4042
DROP TABLE t;

‎tests/queries/0_stateless/03216_arrayWithConstant_limits.sql‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
set enable_parallel_replicas=0;
21
SELECT arrayWithConstant(96142475, ['qMUF']); -- { serverError TOO_LARGE_ARRAY_SIZE }
32
SELECT arrayWithConstant(100000000, materialize([[[[[[[[[['Hello, world!']]]]]]]]]])); -- { serverError TOO_LARGE_ARRAY_SIZE }
43
SELECT length(arrayWithConstant(10000000, materialize([[[[[[[[[['Hello world']]]]]]]]]])));
54

6-
CREATE TEMPORARY TABLE args (value Array(Int)) ENGINE=Memory AS SELECT [1, 1, 1, 1] as value FROM numbers(1, 100);
5+
CREATE TABLE args (value Array(Int)) ENGINE=Memory AS SELECT [1, 1, 1, 1] as value FROM numbers(1, 100);
76
SELECT length(arrayWithConstant(1000000, value)) FROM args FORMAT NULL;

0 commit comments

Comments
 (0)