Skip to content

Commit 85dc343

Browse files
Merge pull request ClickHouse#80412 from ClickHouse/no-bad-tests
Fix bad tests that insert 1000 blocks.
2 parents 41423c2 + 2975f49 commit 85dc343

7 files changed

+8
-8
lines changed

tests/queries/0_stateless/00988_parallel_parts_removal.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-- Tags: long
1+
-- Tags: long, no-object-storage
22

33
DROP TABLE IF EXISTS mt;
44

tests/queries/0_stateless/00989_parallel_parts_loading.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-- Tags: no-random-settings, no-random-merge-tree-settings, no-msan, no-tsan, no-asan, no-debug
1+
-- Tags: no-random-settings, no-random-merge-tree-settings, no-msan, no-tsan, no-asan, no-debug, no-object-storage
22
-- small number of insert threads can make insert terribly slow, especially with some build like msan
33
DROP TABLE IF EXISTS mt;
44

tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ for i in $(seq 1 $NUM_REPLICAS); do
3232

3333
# Note: making 30 connections simultaneously is a mini-DoS when server is build with sanitizers and CI environment is overloaded.
3434
# That's why we repeat "socket timeout" errors.
35-
thread $i $a 2>&1 | grep -v -P 'SOCKET_TIMEOUT|NETWORK_ERROR|^$' &
35+
thread $i $a 2>&1 | tr '\n' ' ' | grep -v -P 'SOCKET_TIMEOUT|NETWORK_ERROR|Timeout while waiting for quorum|^$' &
3636
done
3737
done
3838

tests/queries/0_stateless/02125_many_mutations.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
# Tags: long, no-tsan, no-debug, no-asan, no-msan, no-ubsan, no-shared-merge-tree, no-parallel, no-replicated-database
2+
# Tags: long, no-tsan, no-debug, no-asan, no-msan, no-ubsan, no-shared-merge-tree, no-parallel, no-replicated-database, no-object-storage
33
# no-shared-merge-tree -- this test is too slow
44

55
CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)

tests/queries/0_stateless/02125_many_mutations_2.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
# Tags: long, no-tsan, no-debug, no-asan, no-msan, no-ubsan, no-parallel, no-shared-merge-tree, no-replicated-database
2+
# Tags: long, no-tsan, no-debug, no-asan, no-msan, no-ubsan, no-parallel, no-shared-merge-tree, no-replicated-database, no-object-storage
33
# no-shared-merge-tree -- this test is too slow
44

55
CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)

tests/queries/0_stateless/03237_create_or_replace_view_atomically_with_atomic_engine.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export -f create_or_replace_view_thread;
2323
function select_view_thread
2424
{
2525
for _ in {1..20}; do
26-
$CLICKHOUSE_CLIENT --query "SELECT * FROM ${CLICKHOUSE_DATABASE}_db.test_view FORMAT NULL" | grep -v -P 'Code: (60|741)'
26+
$CLICKHOUSE_CLIENT --query "SELECT * FROM ${CLICKHOUSE_DATABASE}_db.test_view FORMAT NULL" 2>&1 | tr '\n' ' ' | grep -v -P 'Code: (60|741)'
2727
done
2828
}
2929
export -f select_view_thread;

tests/queries/0_stateless/03394_pr_insert_select_threads.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-- Tags: long, no-parallel
1+
-- Tags: long, no-parallel, no-object-storage
22

33
SET enable_analyzer=1; -- parallel distributed insert select for replicated tables works only with analyzer
44
SET parallel_distributed_insert_select=2;
@@ -23,7 +23,7 @@ SYSTEM FLUSH LOGS query_log;
2323
SELECT
2424
if(is_initial_query, 'inital', 'secondary'),
2525
if(toUInt64OrZero(Settings['parallel_replicas_insert_select_local_pipeline']) == 0 and is_initial_query, 1, 8) threads_limit,
26-
if(peak_threads_usage > threads_limit, threads_limit, peak_threads_usage),
26+
least(peak_threads_usage, threads_limit),
2727
format('local_pipeline={}', Settings['parallel_replicas_insert_select_local_pipeline'])
2828
FROM system.query_log
2929
WHERE (current_database = currentDatabase() OR has(databases, currentDatabase())) AND type = 'QueryFinish' AND Settings['allow_experimental_parallel_reading_from_replicas']='1' AND query_kind = 'Insert' AND has(tables, currentDatabase() || '.t_mt_target')

0 commit comments

Comments
 (0)