From 3feab5a975c639ca9a63166016b9a80044eb000a Mon Sep 17 00:00:00 2001
From: Maksim Kita <kitaetoya@gmail.com>
Date: Mon, 20 Dec 2021 13:42:31 +0300
Subject: [PATCH] Containers iteration fix erase

---
 src/Core/Block.cpp                                  | 2 +-
 src/Disks/DiskMemory.cpp                            | 2 +-
 src/Interpreters/TreeRewriter.cpp                   | 4 ++--
 src/Interpreters/getTableExpressions.cpp            | 2 +-
 src/Storages/MergeTree/ActiveDataPartSet.cpp        | 4 ++--
 src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Core/Block.cpp b/src/Core/Block.cpp
index 1bebe5f5efc..1d23325d473 100644
--- a/src/Core/Block.cpp
+++ b/src/Core/Block.cpp
@@ -209,7 +209,7 @@ void Block::eraseImpl(size_t position)
     for (auto it = index_by_name.begin(); it != index_by_name.end();)
     {
         if (it->second == position)
-            index_by_name.erase(it++);
+            it = index_by_name.erase(it);
         else
         {
             if (it->second > position)
diff --git a/src/Disks/DiskMemory.cpp b/src/Disks/DiskMemory.cpp
index ea8bf719de6..834ed3e0c65 100644
--- a/src/Disks/DiskMemory.cpp
+++ b/src/Disks/DiskMemory.cpp
@@ -253,7 +253,7 @@ void DiskMemory::clearDirectory(const String & path)
             throw Exception(
                 "Failed to clear directory '" + path + "'. " + iter->first + " is a directory", ErrorCodes::CANNOT_DELETE_DIRECTORY);
 
-        files.erase(iter++);
+        iter = files.erase(iter);
     }
 }
 
diff --git a/src/Interpreters/TreeRewriter.cpp b/src/Interpreters/TreeRewriter.cpp
index 44b0c760d8d..9fc16bd9757 100644
--- a/src/Interpreters/TreeRewriter.cpp
+++ b/src/Interpreters/TreeRewriter.cpp
@@ -957,7 +957,7 @@ void TreeRewriterResult::collectUsedColumns(const ASTPtr & query, bool is_select
         unknown_required_source_columns.erase(column_name);
 
         if (!required.count(column_name))
-            source_columns.erase(it++);
+            it = source_columns.erase(it);
         else
             ++it;
     }
@@ -973,7 +973,7 @@ void TreeRewriterResult::collectUsedColumns(const ASTPtr & query, bool is_select
             if (column)
             {
                 source_columns.push_back(*column);
-                unknown_required_source_columns.erase(it++);
+                it = unknown_required_source_columns.erase(it);
             }
             else
                 ++it;
diff --git a/src/Interpreters/getTableExpressions.cpp b/src/Interpreters/getTableExpressions.cpp
index d82c7fc1332..830f0ea4411 100644
--- a/src/Interpreters/getTableExpressions.cpp
+++ b/src/Interpreters/getTableExpressions.cpp
@@ -16,7 +16,7 @@ NameSet removeDuplicateColumns(NamesAndTypesList & columns)
         if (names.emplace(it->name).second)
             ++it;
         else
-            columns.erase(it++);
+            it = columns.erase(it);
     }
     return names;
 }
diff --git a/src/Storages/MergeTree/ActiveDataPartSet.cpp b/src/Storages/MergeTree/ActiveDataPartSet.cpp
index 0f6cd8050ca..b21910158ad 100644
--- a/src/Storages/MergeTree/ActiveDataPartSet.cpp
+++ b/src/Storages/MergeTree/ActiveDataPartSet.cpp
@@ -49,7 +49,7 @@ bool ActiveDataPartSet::add(const String & name, Strings * out_replaced_parts)
 
         if (out_replaced_parts)
             out_replaced_parts->push_back(it->second);
-        part_info_to_name.erase(it++);
+        it = part_info_to_name.erase(it);
     }
 
     if (out_replaced_parts)
@@ -61,7 +61,7 @@ bool ActiveDataPartSet::add(const String & name, Strings * out_replaced_parts)
         assert(part_info != it->first);
         if (out_replaced_parts)
             out_replaced_parts->push_back(it->second);
-        part_info_to_name.erase(it++);
+        it = part_info_to_name.erase(it);
     }
 
     if (it != part_info_to_name.end() && !part_info.isDisjoint(it->first))
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
index cc9a142c65c..b3da3d47684 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
@@ -1033,7 +1033,7 @@ void ReplicatedMergeTreeQueue::removePartProducingOpsInRange(
                 min_unprocessed_insert_time_changed, max_processed_insert_time_changed, lock);
 
             (*it)->removed_by_other_entry = true;
-            queue.erase(it++);
+            it = queue.erase(it);
             ++removed_entries;
         }
         else