From ed022bf8e61cef0ceab5ed8b3418bf08925082b9 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Thu, 6 Aug 2020 12:50:23 +0300
Subject: [PATCH] Simplify kill mutations tests

---
 .../0_stateless/00834_kill_mutation.sh        | 44 ++++---------------
 ...0834_kill_mutation_replicated_zookeeper.sh | 44 ++++---------------
 2 files changed, 17 insertions(+), 71 deletions(-)

diff --git a/tests/queries/0_stateless/00834_kill_mutation.sh b/tests/queries/0_stateless/00834_kill_mutation.sh
index 65575b66234..d37ab4b3feb 100755
--- a/tests/queries/0_stateless/00834_kill_mutation.sh
+++ b/tests/queries/0_stateless/00834_kill_mutation.sh
@@ -14,57 +14,31 @@ ${CLICKHOUSE_CLIENT} --query="INSERT INTO test.kill_mutation VALUES ('2001-01-01
 
 ${CLICKHOUSE_CLIENT} --query="SELECT '*** Create and kill a single invalid mutation ***'"
 
-${CLICKHOUSE_CLIENT} --query="ALTER TABLE test.kill_mutation DELETE WHERE toUInt32(s) = 1 SETTINGS mutations_sync = 1" 2>/dev/null &
-
-
-check_query1="SELECT count() FROM system.mutations WHERE database = 'test' AND table = 'kill_mutation' AND is_done = 0"
-
-query_result=$($CLICKHOUSE_CLIENT --query="$check_query1" 2>&1)
-
-while [ "$query_result" == "0" ]
-do
-    query_result=$($CLICKHOUSE_CLIENT --query="$check_query1" 2>&1)
-    sleep 0.5
-done
+${CLICKHOUSE_CLIENT} --query="ALTER TABLE test.kill_mutation DELETE WHERE toUInt32(s) = 1 SETTINGS mutations_sync = 1" 2>/dev/null
 
 ${CLICKHOUSE_CLIENT} --query="SELECT count() FROM system.mutations WHERE database = 'test' AND table = 'kill_mutation' and is_done = 0"
 
-kill_message=$(${CLICKHOUSE_CLIENT} --query="KILL MUTATION WHERE database = 'test' AND table = 'kill_mutation'")
-
-wait
-
-echo "$kill_message"
+${CLICKHOUSE_CLIENT} --query="KILL MUTATION WHERE database = 'test' AND table = 'kill_mutation'"
 
 ${CLICKHOUSE_CLIENT} --query="SELECT mutation_id FROM system.mutations WHERE database = 'test' AND table = 'kill_mutation'"
 
-
 ${CLICKHOUSE_CLIENT} --query="SELECT '*** Create and kill invalid mutation that blocks another mutation ***'"
 
 ${CLICKHOUSE_CLIENT} --query="ALTER TABLE test.kill_mutation DELETE WHERE toUInt32(s) = 1"
-${CLICKHOUSE_CLIENT} --query="ALTER TABLE test.kill_mutation DELETE WHERE x = 1 SETTINGS mutations_sync = 1" 2>&1 | grep -o "happened during execution of mutations 'mutation_4.txt, mutation_5.txt'" | head -n 1 &
-
-check_query2="SELECT count() FROM system.mutations WHERE database = 'test' AND table = 'kill_mutation' AND mutation_id = 'mutation_4.txt'"
-
-query_result=$($CLICKHOUSE_CLIENT --query="$check_query2" 2>&1)
-
-while [ "$query_result" == "0" ]
-do
-    query_result=$($CLICKHOUSE_CLIENT --query="$check_query2" 2>&1)
-    sleep 0.5
-done
+${CLICKHOUSE_CLIENT} --query="ALTER TABLE test.kill_mutation DELETE WHERE x = 1 SETTINGS mutations_sync = 1" 2>&1 | grep -o "happened during execution of mutations 'mutation_4.txt, mutation_5.txt'" | head -n 1
 
+# but exception doesn't stop mutations, and we will still see them in system.mutations
 ${CLICKHOUSE_CLIENT} --query="SELECT count() FROM system.mutations WHERE database = 'test' AND table = 'kill_mutation' AND mutation_id = 'mutation_4.txt'" # 1
 
+# waiting	test	kill_mutation	mutation_4.txt	DELETE WHERE toUInt32(s) = 1
+${CLICKHOUSE_CLIENT} --query="KILL MUTATION WHERE database = 'test' AND table = 'kill_mutation' AND mutation_id = 'mutation_4.txt'"
 
-kill_message=$(${CLICKHOUSE_CLIENT} --query="KILL MUTATION WHERE database = 'test' AND table = 'kill_mutation' AND mutation_id = 'mutation_4.txt'")
-
-wait
-
-echo "$kill_message" # waiting	test	kill_mutation	mutation_4.txt	DELETE WHERE toUInt32(s) = 1
+# just to wait previous mutation to finish (and don't poll system.mutations), doesn't affect data
+${CLICKHOUSE_CLIENT} --query="ALTER TABLE test.kill_mutation DELETE WHERE x = 1 SETTINGS mutations_sync = 1"
 
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM test.kill_mutation" # 2001-01-01	2	b
+
 # must always be empty
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM system.mutations WHERE table = 'kill_mutation' AND database = 'test' AND is_done = 0"
 
-
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE test.kill_mutation"
diff --git a/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh b/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
index 8ba8a17da55..51041876c64 100755
--- a/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
+++ b/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
@@ -20,23 +20,9 @@ ${CLICKHOUSE_CLIENT} --query="SELECT '*** Create and kill a single invalid mutat
 # wrong mutation
 ${CLICKHOUSE_CLIENT} --query="ALTER TABLE test.kill_mutation_r1 DELETE WHERE toUInt32(s) = 1 SETTINGS mutations_sync=2" 2>&1 | grep -o "happened during execution of mutation '0000000000'" | head -n 1
 
-check_query1="SELECT count() FROM system.mutations WHERE database = 'test' AND table = 'kill_mutation_r1' AND is_done = 0"
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM system.mutations WHERE database = 'test' AND table = 'kill_mutation_r1' AND is_done = 0"
 
-query_result=$($CLICKHOUSE_CLIENT --query="$check_query1" 2>&1)
-
-while [ "$query_result" == "0" ]
-do
-    query_result=$($CLICKHOUSE_CLIENT --query="$check_query1" 2>&1)
-    sleep 0.5
-done
-
-$CLICKHOUSE_CLIENT --query="SELECT count() FROM system.mutations WHERE database = 'test' AND table = 'kill_mutation_r1' AND is_done = 0"
-
-kill_message=$(${CLICKHOUSE_CLIENT} --query="KILL MUTATION WHERE database = 'test' AND table = 'kill_mutation_r1'")
-
-wait
-
-echo "$kill_message"
+${CLICKHOUSE_CLIENT} --query="KILL MUTATION WHERE database = 'test' AND table = 'kill_mutation_r1'"
 
 # No active mutations exists
 ${CLICKHOUSE_CLIENT} --query="SELECT count() FROM system.mutations WHERE database = 'test' AND table = 'kill_mutation_r1'"
@@ -51,44 +37,30 @@ ${CLICKHOUSE_CLIENT} --query="SELECT * FROM system.replication_queue WHERE table
 
 ${CLICKHOUSE_CLIENT} --query="ALTER TABLE test.kill_mutation_r1 DELETE WHERE toUInt32(s) = 1"
 
+# good mutation, but blocked with wrong mutation
+${CLICKHOUSE_CLIENT} --query="ALTER TABLE test.kill_mutation_r1 DELETE WHERE x = 1"
+
 check_query1="SELECT count() FROM system.mutations WHERE database = 'test' AND table = 'kill_mutation_r1' AND is_done = 0"
 
 query_result=$($CLICKHOUSE_CLIENT --query="$check_query1" 2>&1)
 
-while [ "$query_result" == "0" ]
+while [ "$query_result" != "2" ]
 do
     query_result=$($CLICKHOUSE_CLIENT --query="$check_query1" 2>&1)
     sleep 0.5
 done
 
-# good mutation, but blocked with wrong mutation
-${CLICKHOUSE_CLIENT} --query="ALTER TABLE test.kill_mutation_r1 DELETE WHERE x = 1 SETTINGS mutations_sync=2" &
-
-check_query2="SELECT count() FROM system.mutations WHERE database = 'test' AND table = 'kill_mutation_r1' AND mutation_id = '0000000001' AND is_done = 0"
-
-query_result=$($CLICKHOUSE_CLIENT --query="$check_query2" 2>&1)
-
-while [ "$query_result" == "0" ]
-do
-    query_result=$($CLICKHOUSE_CLIENT --query="$check_query2" 2>&1)
-    sleep 0.5
-done
-
 $CLICKHOUSE_CLIENT --query="SELECT count() FROM system.mutations WHERE database = 'test' AND table = 'kill_mutation_r1' AND mutation_id = '0000000001' AND is_done = 0"
 
-kill_message=$(${CLICKHOUSE_CLIENT} --query="KILL MUTATION WHERE database = 'test' AND table = 'kill_mutation_r1' AND mutation_id = '0000000001'")
-
-wait
-
-echo "$kill_message"
+${CLICKHOUSE_CLIENT} --query="KILL MUTATION WHERE database = 'test' AND table = 'kill_mutation_r1' AND mutation_id = '0000000001'"
 
 ${CLICKHOUSE_CLIENT} --query="SYSTEM SYNC REPLICA test.kill_mutation_r1"
 ${CLICKHOUSE_CLIENT} --query="SYSTEM SYNC REPLICA test.kill_mutation_r2"
 
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM test.kill_mutation_r2"
+
 # must be empty
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM system.mutations WHERE table = 'kill_mutation' AND database = 'test' AND is_done = 0"
 
-
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE test.kill_mutation_r1"
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE test.kill_mutation_r2"