another attempt to fix tests

This commit is contained in:
Alexander Tokmakov 2022-06-03 12:49:16 +02:00
parent 63eea42c6a
commit ce5acdb1eb
3 changed files with 8 additions and 14 deletions

View File

@ -17,7 +17,6 @@ $CLICKHOUSE_CLIENT --query "CREATE TABLE dst (n UInt64, type UInt8) ENGINE=Merge
function thread_insert()
{
set -e
trap "exit 0" INT
val=1
while true; do
$CLICKHOUSE_CLIENT --multiquery --query "
@ -92,7 +91,6 @@ function thread_partition_dst_to_src()
function thread_select()
{
set -e
trap "exit 0" INT
while true; do
$CLICKHOUSE_CLIENT --multiquery --query "
BEGIN TRANSACTION;
@ -120,8 +118,8 @@ thread_partition_src_to_dst & PID_3=$!
thread_partition_dst_to_src & PID_4=$!
wait $PID_3 && wait $PID_4
kill -INT $PID_1
kill -INT $PID_2
kill -TERM $PID_1
kill -TERM $PID_2
wait
$CLICKHOUSE_CLIENT -q "SELECT type, count(n) = countDistinct(n) FROM merge(currentDatabase(), '') GROUP BY type ORDER BY type"

View File

@ -50,7 +50,6 @@ function thread_insert_rollback()
function thread_optimize()
{
set -e
trap "exit 0" INT
while true; do
optimize_query="OPTIMIZE TABLE src"
partition_id=$(( RANDOM % 2 ))
@ -81,7 +80,6 @@ function thread_optimize()
function thread_select()
{
set -e
trap "exit 0" INT
while true; do
$CLICKHOUSE_CLIENT --multiquery --query "
BEGIN TRANSACTION;
@ -102,7 +100,6 @@ function thread_select()
function thread_select_insert()
{
set -e
trap "exit 0" INT
while true; do
$CLICKHOUSE_CLIENT --multiquery --query "
BEGIN TRANSACTION;
@ -137,11 +134,11 @@ thread_select & PID_7=$!
thread_select_insert & PID_8=$!
wait $PID_1 && wait $PID_2 && wait $PID_3
kill -INT $PID_4
kill -INT $PID_5
kill -INT $PID_6
kill -INT $PID_7
kill -INT $PID_8
kill -TERM $PID_4
kill -TERM $PID_5
kill -TERM $PID_6
kill -TERM $PID_7
kill -TERM $PID_8
wait
$CLICKHOUSE_CLIENT --multiquery --query "

View File

@ -35,7 +35,6 @@ function thread_insert_rollback()
function thread_select()
{
trap "exit 0" INT
while true; do
# Result of `uniq | wc -l` must be 1 if the first and the last queries got the same result
$CLICKHOUSE_CLIENT --multiquery --query "
@ -54,7 +53,7 @@ thread_insert_commit 2 & PID_2=$!
thread_insert_rollback 3 & PID_3=$!
thread_select & PID_4=$!
wait $PID_1 && wait $PID_2 && wait $PID_3
kill -INT $PID_4
kill -TERM $PID_4
wait
$CLICKHOUSE_CLIENT --multiquery --query "