thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-24 10:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename method for settings check

Browse Source
This commit is contained in:
alesapin 2019-09-01 00:15:40 +03:00
parent 2647d4ca15
commit 7382a9f3c3
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/Storages/AlterCommands.cpp
View File

@ -544,7 +544,7 @@ void AlterCommands::validate(const IStorage & table, const Context & context)
}
else if (command.type == AlterCommand::MODIFY_SETTING)
for (const auto & change : command.settings_changes)
table.checkSetting(change.name);
table.checkSettingCanBeChanged(change.name);
}
/** Existing defaulted columns may require default expression extensions with a type conversion,

4
dbms/src/Storages/IStorage.cpp
View File

@ -309,7 +309,7 @@ bool IStorage::isVirtualColumn(const String & column_name) const
return getColumns().get(column_name).is_virtual;
}
void IStorage::checkSetting(const String & /* setting_name */) const
void IStorage::checkSettingCanBeChanged(const String & /* setting_name */) const
{
if (!supportsSettings())
throw Exception("Storage '" + getName() + "' doesn't support settings.", ErrorCodes::SETTINGS_ARE_NOT_SUPPORTED);
@ -380,7 +380,7 @@ IDatabase::ASTModifier IStorage::getSettingsModifier(const SettingsChanges & new
/// Make storage settings unique
for (const auto & change : new_changes)
{
checkSetting(change.name);
checkSettingCanBeChanged(change.name);
auto finder = [&change] (const SettingChange & c) { return c.name == change.name; };
if (auto it = std::find_if(storage_changes.begin(), storage_changes.end(), finder); it != storage_changes.end())

2
dbms/src/Storages/IStorage.h
View File

@ -140,7 +140,7 @@ public: /// thread-unsafe part. lockStructure must be acquired
void check(const Block & block, bool need_all = false) const;
/// Check storage has setting and setting can be modified.
virtual void checkSetting(const String & setting_name) const;
virtual void checkSettingCanBeChanged(const String & setting_name) const;
protected: /// still thread-unsafe part.
void setIndices(IndicesDescription indices_);

2
dbms/src/Storages/Kafka/StorageKafka.cpp
View File

@ -412,7 +412,7 @@ bool StorageKafka::streamToViews()
}
void StorageKafka::checkSetting(const String & setting_name) const
void StorageKafka::checkSettingCanBeChanged(const String & setting_name) const
{
if (KafkaSettings::findIndex(setting_name) == KafkaSettings::npos)
throw Exception{"Storage '" + getName() + "' doesn't have setting '" + setting_name + "'", ErrorCodes::UNKNOWN_SETTING};

2
dbms/src/Storages/Kafka/StorageKafka.h
View File

@ -57,7 +57,7 @@ public:
const auto & getSchemaName() const { return schema_name; }
const auto & skipBroken() const { return skip_broken; }
void checkSetting(const String & setting_name) const override;
void checkSettingCanBeChanged(const String & setting_name) const override;
protected:
StorageKafka(

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

@ -1325,7 +1325,7 @@ void MergeTreeData::checkAlter(const AlterCommands & commands, const Context & c
setTTLExpressions(new_columns.getColumnTTLs(), new_ttl_table_ast, /* only_check = */ true);
for (const auto & setting : new_changes)
checkSetting(setting.name);
checkSettingCanBeChanged(setting.name);
/// Check that type conversions are possible.
ExpressionActionsPtr unused_expression;
@ -1657,7 +1657,7 @@ void MergeTreeData::changeSettings(
}
}
void MergeTreeData::checkSetting(const String & setting_name) const
void MergeTreeData::checkSettingCanBeChanged(const String & setting_name) const
{
if (MergeTreeSettings::findIndex(setting_name) == MergeTreeSettings::npos)
throw Exception{"Storage '" + getName() + "' doesn't have setting '" + setting_name + "'", ErrorCodes::UNKNOWN_SETTING};

2
dbms/src/Storages/MergeTree/MergeTreeData.h
View File

@ -543,7 +543,7 @@ public:
TableStructureWriteLockHolder & table_lock_holder);
/// All MergeTreeData children have settings.
void checkSetting(const String & setting_name) const override;
void checkSettingCanBeChanged(const String & setting_name) const override;
/// Remove columns, that have been markedd as empty after zeroing values with expired ttl
void removeEmptyColumnsFromPart(MergeTreeData::MutableDataPartPtr & data_part);