From eaaef837426ac9dc61d7c8c257261f82ba896744 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Wed, 17 Jun 2020 16:46:01 +0300
Subject: [PATCH] Settings changes in StorageInMemoryMetadata

---
 src/Storages/IStorage.cpp                | 7 -------
 src/Storages/IStorage.h                  | 5 -----
 src/Storages/MergeTree/MergeTreeData.cpp | 4 ++--
 src/Storages/StorageInMemoryMetadata.cpp | 8 ++++++++
 src/Storages/StorageInMemoryMetadata.h   | 4 ++++
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Storages/IStorage.cpp b/src/Storages/IStorage.cpp
index 3741a06fc4a..6b3aafa1784 100644
--- a/src/Storages/IStorage.cpp
+++ b/src/Storages/IStorage.cpp
@@ -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;
diff --git a/src/Storages/IStorage.h b/src/Storages/IStorage.h
index 4eea343db5d..d9e9aa247c2 100644
--- a/src/Storages/IStorage.h
+++ b/src/Storages/IStorage.h
@@ -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;
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index 8c94325cd4b..115e0b78bf0 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -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)
         {
diff --git a/src/Storages/StorageInMemoryMetadata.cpp b/src/Storages/StorageInMemoryMetadata.cpp
index 404baa6677f..5f8c83d6e14 100644
--- a/src/Storages/StorageInMemoryMetadata.cpp
+++ b/src/Storages/StorageInMemoryMetadata.cpp
@@ -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;
+}
+
 }
diff --git a/src/Storages/StorageInMemoryMetadata.h b/src/Storages/StorageInMemoryMetadata.h
index cc6fcfbe083..1de17d768ae 100644
--- a/src/Storages/StorageInMemoryMetadata.h
+++ b/src/Storages/StorageInMemoryMetadata.h
@@ -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>;