From ae2c106f94ad9a666879652f16dd746b7e5f703d Mon Sep 17 00:00:00 2001
From: Alexander Kazakov <Akazz@users.noreply.github.com>
Date: Tue, 6 Oct 2020 17:04:08 +0300
Subject: [PATCH] Minor fixes

---
 src/Storages/StorageMemory.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Storages/StorageMemory.cpp b/src/Storages/StorageMemory.cpp
index 1b722f5fa73..111e121162b 100644
--- a/src/Storages/StorageMemory.cpp
+++ b/src/Storages/StorageMemory.cpp
@@ -21,7 +21,7 @@ namespace ErrorCodes
 
 class MemorySource : public SourceWithProgress
 {
-    using InitializerFunc = std::function<void(BlocksList::iterator &, size_t &)>;
+    using InitializerFunc = std::function<void(BlocksList::const_iterator &, size_t &)>;
 public:
     /// Blocks are stored in std::list which may be appended in another thread.
     /// We use pointer to the beginning of the list and its current size.
@@ -34,7 +34,7 @@ public:
         size_t num_blocks_,
         const StorageMemory & storage,
         const StorageMetadataPtr & metadata_snapshot,
-        InitializerFunc initializer_func_ = [](size_t &, size_t &) {})
+        InitializerFunc initializer_func_ = [](BlocksList::const_iterator &, size_t &) {})
         : SourceWithProgress(metadata_snapshot->getSampleBlockForColumns(column_names_, storage.getVirtuals(), storage.getStorageID()))
         , column_names(column_names_)
         , current_it(first_)
@@ -146,17 +146,18 @@ Pipe StorageMemory::read(
         /// set for IN or hash table for JOIN, which can't be done concurrently.
         /// Since no other manipulation with data is done, multiple sources shouldn't give any profit.
 
-        return {std::make_shared<MemorySource>(
+        return Pipe(
+                std::make_shared<MemorySource>(
                         column_names, data.end(), 0, *this, metadata_snapshot,
                         /// This hack is needed for global subqueries.
                         /// It allows to set up this Source for read AFTER Storage::read() has been called and just before actual reading
-                        [this](size_t & current_it, size_t & num_blocks)
+                        [this](BlocksList::const_iterator & current_it, size_t & num_blocks)
                         {
                             std::lock_guard guard(mutex);
                             current_it = data.begin();
                             num_blocks = data.size();
                         }
-                )};
+                ));
     }
 
     std::lock_guard lock(mutex);
@@ -168,7 +169,7 @@ Pipe StorageMemory::read(
 
     Pipes pipes;
 
-    BlocksList::iterator it = data.begin();
+    BlocksList::const_iterator it = data.begin();
 
     size_t offset = 0;
     for (size_t stream = 0; stream < num_streams; ++stream)
@@ -178,7 +179,7 @@ Pipe StorageMemory::read(
 
         assert(num_blocks > 0);
 
-        pipes.push_back(std::make_shared<MemorySource>(column_names, it, num_blocks, *this, metadata_snapshot));
+        pipes.emplace_back(std::make_shared<MemorySource>(column_names, it, num_blocks, *this, metadata_snapshot));
 
         while (offset < next_offset)
         {