From 39b40f8e429ace52f19d206eec89bb897f2af079 Mon Sep 17 00:00:00 2001 From: Nikita Vasilev Date: Sun, 28 Jul 2019 17:55:51 +0300 Subject: [PATCH] fix replicated indices mutations --- dbms/src/Storages/StorageReplicatedMergeTree.cpp | 2 +- .../0_stateless/00975_indices_mutation_replicated_zookeeper.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) mode change 100644 => 100755 dbms/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper.sh diff --git a/dbms/src/Storages/StorageReplicatedMergeTree.cpp b/dbms/src/Storages/StorageReplicatedMergeTree.cpp index 0134c425a94..ef474e612cf 100644 --- a/dbms/src/Storages/StorageReplicatedMergeTree.cpp +++ b/dbms/src/Storages/StorageReplicatedMergeTree.cpp @@ -865,7 +865,7 @@ bool StorageReplicatedMergeTree::executeLogEntry(LogEntry & entry) return true; } - if (entry.type == LogEntry::CLEAR_COLUMN) + if (entry.type == LogEntry::CLEAR_COLUMN || entry.type == LogEntry::CLEAR_INDEX) { executeClearColumnOrIndexInPartition(entry); return true; diff --git a/dbms/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper.sh b/dbms/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper.sh old mode 100644 new mode 100755 index 4490487663f..613226a3fb7 --- a/dbms/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper.sh +++ b/dbms/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper.sh @@ -3,7 +3,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) . $CURDIR/../shell_config.sh -$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS test.minmax_idx;" +$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS test.indices_mutaions1;" +$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS test.indices_mutaions2;" $CLICKHOUSE_CLIENT -n --query="