From 9f2628b8f2af39b6bbfc61f5490e1911c8cba234 Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Tue, 8 Feb 2022 16:41:55 +0100
Subject: [PATCH] Fix

---
 .../PostgreSQL/StorageMaterializedPostgreSQL.cpp       | 10 ++++++++--
 src/Storages/ReadFinalForExternalReplicaStorage.cpp    |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
index fe81b322bdb..c72dec824f0 100644
--- a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
+++ b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
@@ -277,10 +277,16 @@ Pipe StorageMaterializedPostgreSQL::read(
         size_t max_block_size,
         unsigned num_streams)
 {
-    auto materialized_table_lock = lockForShare(String(), context_->getSettingsRef().lock_acquire_timeout);
     auto nested_table = getNested();
-    return readFinalFromNestedStorage(nested_table, column_names, metadata_snapshot,
+
+    auto pipe = readFinalFromNestedStorage(nested_table, column_names, metadata_snapshot,
             query_info, context_, processed_stage, max_block_size, num_streams);
+
+    auto lock = lockForShare(context_->getCurrentQueryId(), context_->getSettingsRef().lock_acquire_timeout);
+    pipe.addTableLock(lock);
+    pipe.addStorageHolder(shared_from_this());
+
+    return pipe;
 }
 
 
diff --git a/src/Storages/ReadFinalForExternalReplicaStorage.cpp b/src/Storages/ReadFinalForExternalReplicaStorage.cpp
index 36a40beca36..58b98aaa4c6 100644
--- a/src/Storages/ReadFinalForExternalReplicaStorage.cpp
+++ b/src/Storages/ReadFinalForExternalReplicaStorage.cpp
@@ -57,6 +57,7 @@ Pipe readFinalFromNestedStorage(
 
     Pipe pipe = nested_storage->read(require_columns_name, nested_metadata, query_info, context, processed_stage, max_block_size, num_streams);
     pipe.addTableLock(lock);
+    pipe.addStorageHolder(nested_storage);
 
     if (!expressions->children.empty() && !pipe.empty())
     {