diff --git a/tests/queries/0_stateless/00121_drop_column_zookeeper.sql b/tests/queries/0_stateless/00121_drop_column_zookeeper.sql index ed1f654f847..915551aa84f 100644 --- a/tests/queries/0_stateless/00121_drop_column_zookeeper.sql +++ b/tests/queries/0_stateless/00121_drop_column_zookeeper.sql @@ -1,5 +1,6 @@ --- Tags: zookeeper, no-replicated-database +-- Tags: zookeeper, no-replicated-database, no-shared-merge-tree -- Tag no-replicated-database: Old syntax is not allowed +-- no-shared-merge-tree: implemented replacement DROP TABLE IF EXISTS alter_00121 SYNC; set allow_deprecated_syntax_for_merge_tree=1; diff --git a/tests/queries/0_stateless/00155_long_merges.sh b/tests/queries/0_stateless/00155_long_merges.sh index 8ecca0aeb42..7c0bdd217c9 100755 --- a/tests/queries/0_stateless/00155_long_merges.sh +++ b/tests/queries/0_stateless/00155_long_merges.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Tags: long, no-debug +# Tags: long, no-debug, no-asan, no-tsan, no-msan CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) # shellcheck source=../shell_config.sh diff --git a/tests/queries/0_stateless/00215_primary_key_order_zookeeper_long.sql b/tests/queries/0_stateless/00215_primary_key_order_zookeeper_long.sql index f031ae7f54f..218f8de919d 100644 --- a/tests/queries/0_stateless/00215_primary_key_order_zookeeper_long.sql +++ b/tests/queries/0_stateless/00215_primary_key_order_zookeeper_long.sql @@ -1,5 +1,6 @@ --- Tags: long, zookeeper, no-replicated-database +-- Tags: long, zookeeper, no-replicated-database, no-shared-merge-tree -- Tag no-replicated-database: Old syntax is not allowed +-- no-shared-merge-tree: implemented replacement DROP TABLE IF EXISTS primary_key; set allow_deprecated_syntax_for_merge_tree=1; diff --git a/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts_long.sql b/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts_long.sql index 727c793efb0..8968f83de17 100644 --- a/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts_long.sql +++ b/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts_long.sql @@ -1,5 +1,6 @@ --- Tags: long, zookeeper, no-replicated-database +-- Tags: long, zookeeper, no-replicated-database, no-shared-merge-tree -- Tag no-replicated-database: Old syntax is not allowed +-- no-shared-merge-tree: implemented replacement DROP TABLE IF EXISTS deduplication; set allow_deprecated_syntax_for_merge_tree=1; diff --git a/tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper_long.sql b/tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper_long.sql index 78319c3edd4..aa5d7e10b4f 100644 --- a/tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper_long.sql +++ b/tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper_long.sql @@ -1,5 +1,6 @@ --- Tags: long, replica, no-replicated-database +-- Tags: long, replica, no-replicated-database, no-shared-merge-tree -- Tag no-replicated-database: Old syntax is not allowed +-- no-shared-merge-tree: implemented replacement SET replication_alter_partitions_sync = 2; diff --git a/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh b/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh index eee84aa7754..2d95c4e46c2 100755 --- a/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh +++ b/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -# Tags: zookeeper, no-replicated-database +# Tags: zookeeper, no-replicated-database, no-shared-merge-tree # Tag no-replicated-database: Old syntax is not allowed +# no-shared-merge-tree -- old syntax CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) # shellcheck source=../shell_config.sh diff --git a/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper_long.sql b/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper_long.sql index c820cce11af..5427119f40c 100644 --- a/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper_long.sql +++ b/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper_long.sql @@ -1,4 +1,5 @@ --- Tags: long, zookeeper +-- Tags: long, zookeeper, no-shared-merge-tree +-- no-shared-merge-tree: different sychronization, replaced with another test SELECT '===Ordinary case==='; diff --git a/tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper_long.sql b/tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper_long.sql index a5e33bffb0d..06484f53dad 100644 --- a/tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper_long.sql +++ b/tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper_long.sql @@ -1,4 +1,5 @@ --- Tags: long, replica +-- Tags: long, replica, no-shared-merge-tree +-- no-shared-merge-tree: different synchronization SET replication_alter_partitions_sync = 2; SET insert_keeper_fault_injection_probability=0; diff --git a/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql b/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql index 3f322c8ce18..c0b70f87de8 100644 --- a/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql +++ b/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql @@ -1,4 +1,5 @@ --- Tags: zookeeper +-- Tags: zookeeper, no-shared-merge-tree +-- no-shared-merge-tree: boring test, nothing new SET optimize_on_insert = 0; diff --git a/tests/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.sql b/tests/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.sql index 24e581bb201..fb996684d65 100644 --- a/tests/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.sql +++ b/tests/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.sql @@ -1,7 +1,6 @@ -- Tags: zookeeper DROP TABLE IF EXISTS deduplication_by_partition; -set allow_deprecated_syntax_for_merge_tree=1; CREATE TABLE deduplication_by_partition(d Date, x UInt32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00516/deduplication_by_partition', 'r1') order by x partition by toYYYYMM(d);