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

Settings changes in StorageInMemoryMetadata

Browse Source
This commit is contained in:
alesapin 2020-06-17 16:46:01 +03:00
parent ed8f3b2fc4
commit eaaef83742
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Storages/IStorage.cpp
View File

@ -319,13 +319,6 @@ NamesAndTypesList IStorage::getVirtuals() const
return {};
}
ASTPtr IStorage::getSettingsChanges() const
{
if (metadata->settings_changes)
return metadata->settings_changes->clone();
return nullptr;
}
const SelectQueryDescription & IStorage::getSelectQuery() const
{
return metadata->select;

5
src/Storages/IStorage.h
View File

@ -138,11 +138,6 @@ public:
public: /// thread-unsafe part. lockStructure must be acquired
const ColumnsDescription & getColumns() const; /// returns combined set of columns
/// Storage settings
ASTPtr getSettingsChanges() const;
bool hasSettingsChanges() const { return metadata->settings_changes != nullptr; }
/// Select query for *View storages.
const SelectQueryDescription & getSelectQuery() const;
bool hasSelectQuery() const;

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

@ -1333,10 +1333,10 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, const S
checkTTLExpressions(new_metadata, old_metadata);
if (hasSettingsChanges())
if (old_metadata.hasSettingsChanges())
{
const auto current_changes = getSettingsChanges()->as<const ASTSetQuery &>().changes;
const auto current_changes = old_metadata.getSettingsChanges()->as<const ASTSetQuery &>().changes;
const auto & new_changes = new_metadata.settings_changes->as<const ASTSetQuery &>().changes;
for (const auto & changed_setting : new_changes)
{

8
src/Storages/StorageInMemoryMetadata.cpp
View File

@ -393,4 +393,12 @@ Names StorageInMemoryMetadata::getPrimaryKeyColumns() const
return primary_key.column_names;
return {};
}
ASTPtr StorageInMemoryMetadata::getSettingsChanges() const
{
if (settings_changes)
return settings_changes->clone();
return nullptr;
}
}

4
src/Storages/StorageInMemoryMetadata.h
View File

@ -169,6 +169,10 @@ struct StorageInMemoryMetadata
/// Returns columns names in sorting key specified by. For example: 'a', 'x
/// * y', 'toStartOfMonth(date)', etc.
Names getPrimaryKeyColumns() const;
/// Storage settings
ASTPtr getSettingsChanges() const;
bool hasSettingsChanges() const { return settings_changes != nullptr; }
};
using StorageMetadataPtr = std::shared_ptr<StorageInMemoryMetadata>;