thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-26 17:41:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4683 from amosbird/fixempty

Browse Source 
Do not wait when there is not log entry.
This commit is contained in:
alexey-milovidov 2019-03-14 04:16:02 +03:00 committed by GitHub
commit 1cd7c91404
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dbms/src/Storages/StorageReplicatedMergeTree.cpp
View File

@ -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;