Merge branch 'master' of github.com:yandex/ClickHouse

housepower · Mar 14, 2019 · cc947da · cc947da
2 parents 3e8d9ec + 1cd7c91
commit cc947da
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/dbms/src/Storages/StorageReplicatedMergeTree.cpp b/dbms/src/Storages/StorageReplicatedMergeTree.cpp
@@ -3080,7 +3080,8 @@ bool StorageReplicatedMergeTree::optimize(const ASTPtr & query, const ASTPtr & p
     }
 
     /// TODO: Bad setting name for such purpose
-    if (query_context.getSettingsRef().replication_alter_partitions_sync != 0)
+    if (merge_entry.type != ReplicatedMergeTreeLogEntryData::Type::EMPTY
+        && query_context.getSettingsRef().replication_alter_partitions_sync != 0)
         waitForAllReplicasToProcessLogEntry(merge_entry);
 
     return true;