fix tests

This commit is contained in:
Alexander Tokmakov 2021-12-24 16:14:17 +03:00
parent b54178e723
commit 0fc8c259c7
3 changed files with 17 additions and 18 deletions

View File

@ -21,17 +21,17 @@ tx7 7 20 all_1_1_0_13
tx7 7 40 all_14_14_0
tx7 7 60 all_7_7_0_13
tx7 7 80 all_12_12_0_13
tx7 8 20 all_19_19_0
tx7 8 40 all_17_17_0
tx7 8 60 all_18_18_0
tx7 8 80 all_16_16_0
tx7 8 20 all_1_14_1_13
tx7 8 40 all_1_14_1_13
tx7 8 60 all_1_14_1_13
tx7 8 80 all_1_14_1_13
Serialization error
INVALID_TRANSACTION
tx11 9 21 all_19_19_0_21
tx11 9 41 all_17_17_0_21
tx11 9 61 all_18_18_0_21
tx11 9 81 all_16_16_0_21
tx13 10 22 all_19_19_0_22
tx13 10 42 all_17_17_0_22
tx13 10 62 all_18_18_0_22
tx13 10 82 all_16_16_0_22
tx11 9 21 all_1_14_1_17
tx11 9 41 all_1_14_1_17
tx11 9 61 all_1_14_1_17
tx11 9 81 all_1_14_1_17
tx13 10 22 all_1_14_1_18
tx13 10 42 all_1_14_1_18
tx13 10 62 all_1_14_1_18
tx13 10 82 all_1_14_1_18

View File

@ -57,11 +57,10 @@ tx 6 "commit"
tx 7 "begin transaction"
tx 7 "select 7, n, _part from mt order by n"
tx 8 "begin transaction"
tx_async 8 "alter table mt update n = 0 where 1" >/dev/null
tx_async 8 "alter table mt update n = 0 where 1" >/dev/null
$CLICKHOUSE_CLIENT -q "kill mutation where database=currentDatabase() and mutation_id='mutation_15.txt' format Null"
tx 7 "alter table mt detach partition id 'all'"
tx_wait 8
tx 7 "alter table mt attach partition id 'all'"
tx 7 "optimize table mt final"
tx 7 "select 8, n, _part from mt order by n"
tx 8 "rollback"
tx 10 "begin transaction"

View File

@ -51,7 +51,7 @@ function tx_async()
tx_num=$1
query=$2
tx_wait $tx_num
tx_wait "$tx_num"
session="${CLICKHOUSE_TEST_ZOOKEEPER_PREFIX}_tx$tx_num"
query_id="${session}_${RANDOM}"
@ -73,6 +73,6 @@ function tx_sync()
{
tx_num=$1
query=$2
tx_wait $tx_num
tx $tx_num $query
tx_wait "$tx_num"
tx "$tx_num" "$query"
}