thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-02 12:32:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove empty block

Browse Source
This commit is contained in:
alesapin 2019-08-13 15:03:42 +03:00
parent 5b85373c56
commit b00903330f
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dbms/src/Storages/MergeTree/MergeTreeData.cpp
View File

@ -1644,12 +1644,11 @@ void MergeTreeData::alterSettings(
const Context & context, const Context & context,
TableStructureWriteLockHolder & table_lock_holder) TableStructureWriteLockHolder & table_lock_holder)
{ {
{ /// No additional locking required, because we took table_lock_holder
MutableMergeTreeSettingsPtr settings = std::move(*guarded_settings.getPtr()).mutate(); MutableMergeTreeSettingsPtr settings = std::move(*guarded_settings.getPtr()).mutate();
settings->updateFromChanges(new_changes); settings->updateFromChanges(new_changes);
IStorage::alterSettings(new_changes, current_database_name, current_table_name, context, table_lock_holder); IStorage::alterSettings(new_changes, current_database_name, current_table_name, context, table_lock_holder);
guarded_settings.setPtr(std::move(settings)); guarded_settings.setPtr(std::move(settings));
}
} }
bool MergeTreeData::hasSetting(const String & setting_name) const bool MergeTreeData::hasSetting(const String & setting_name) const