From 75977bd939887daa55f320951b431f4392a0acb6 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Wed, 10 Jun 2020 00:22:01 +0300
Subject: [PATCH] Gcc fixed

---
 src/Storages/MergeTree/MergeTreeData.cpp    | 12 ++++++------
 src/Storages/StorageMaterializedView.cpp    | 10 +++++-----
 src/Storages/StorageReplicatedMergeTree.cpp |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index dd70e7b2b5c..50971bbc881 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -1273,9 +1273,9 @@ bool isMetadataOnlyConversion(const IDataType * from, const IDataType * to)
 void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, const Settings & settings)
 {
     /// Check that needed transformations can be applied to the list of columns without considering type conversions.
-    StorageInMemoryMetadata metadata = getInMemoryMetadata();
-    commands.apply(metadata, global_context);
-    if (getSecondaryIndices().empty() && !metadata.secondary_indices.empty() &&
+    StorageInMemoryMetadata new_metadata = getInMemoryMetadata();
+    commands.apply(new_metadata, global_context);
+    if (getSecondaryIndices().empty() && !new_metadata.secondary_indices.empty() &&
             !settings.allow_experimental_data_skipping_indices)
         throw Exception("You must set the setting `allow_experimental_data_skipping_indices` to 1 " \
                         "before using data skipping indices.", ErrorCodes::BAD_ARGUMENTS);
@@ -1365,15 +1365,15 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, const S
         }
     }
 
-    setProperties(metadata, /* only_check = */ true);
+    setProperties(new_metadata, /* only_check = */ true);
 
-    setTTLExpressions(metadata.columns, metadata.table_ttl, /* only_check = */ true);
+    setTTLExpressions(new_metadata.columns, new_metadata.table_ttl, /* only_check = */ true);
 
     if (hasSettingsChanges())
     {
 
         const auto & current_changes = getSettingsChanges()->as<const ASTSetQuery &>().changes;
-        const auto & new_changes = metadata.settings_changes->as<const ASTSetQuery &>().changes;
+        const auto & new_changes = new_metadata.settings_changes->as<const ASTSetQuery &>().changes;
         for (const auto & changed_setting : new_changes)
         {
             if (MergeTreeSettings::findIndex(changed_setting.name) == MergeTreeSettings::npos)
diff --git a/src/Storages/StorageMaterializedView.cpp b/src/Storages/StorageMaterializedView.cpp
index a7a59f0e9b9..08984a6e1f3 100644
--- a/src/Storages/StorageMaterializedView.cpp
+++ b/src/Storages/StorageMaterializedView.cpp
@@ -193,13 +193,13 @@ void StorageMaterializedView::alter(
 {
     lockStructureExclusively(table_lock_holder, context.getCurrentQueryId(), context.getSettingsRef().lock_acquire_timeout);
     auto table_id = getStorageID();
-    StorageInMemoryMetadata metadata = getInMemoryMetadata();
-    params.apply(metadata, context);
+    StorageInMemoryMetadata new_metadata = getInMemoryMetadata();
+    params.apply(new_metadata, context);
 
     /// start modify query
     if (context.getSettingsRef().allow_experimental_alter_materialized_view_structure)
     {
-        const auto & new_select = metadata.select;
+        const auto & new_select = new_metadata.select;
         const auto & old_select = getSelectQuery();
 
         DatabaseCatalog::instance().updateDependency(old_select.select_table_id, table_id, new_select.select_table_id, table_id);
@@ -208,8 +208,8 @@ void StorageMaterializedView::alter(
     }
     /// end modify query
 
-    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(context, table_id, metadata);
-    setColumns(std::move(metadata.columns));
+    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(context, table_id, new_metadata);
+    setColumns(std::move(new_metadata.columns));
 }
 
 
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index f4941a05bf2..8efe22e03f9 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -415,12 +415,12 @@ void StorageReplicatedMergeTree::createTableIfNotExists()
     zookeeper->createAncestors(zookeeper_path);
 
     /// We write metadata of table so that the replicas can check table parameters with them.
-    String metadata = ReplicatedMergeTreeTableMetadata(*this).toString();
+    String metadata_str = ReplicatedMergeTreeTableMetadata(*this).toString();
 
     Coordination::Requests ops;
     ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path, "",
         zkutil::CreateMode::Persistent));
-    ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/metadata", metadata,
+    ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/metadata", metadata_str,
         zkutil::CreateMode::Persistent));
     ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/columns", getColumns().toString(),
         zkutil::CreateMode::Persistent));