From 016a9c674bc6a50df8bb1896c18669e53e84ea45 Mon Sep 17 00:00:00 2001
From: Pavel Kovalenko <jokserfn@yandex-team.ru>
Date: Tue, 20 Apr 2021 21:52:58 +0300
Subject: [PATCH] DiskRestartProxy refactoring.

---
 src/Disks/S3/DiskS3.cpp                 |  6 +++---
 src/IO/WriteBufferFromFileDecorator.cpp | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Disks/S3/DiskS3.cpp b/src/Disks/S3/DiskS3.cpp
index ca5d88e623d..bce3c24c546 100644
--- a/src/Disks/S3/DiskS3.cpp
+++ b/src/Disks/S3/DiskS3.cpp
@@ -384,13 +384,13 @@ private:
 };
 
 /// Stores data in S3 and adds the object key (S3 path) and object size to metadata file on local FS.
-class WriteIndirectBufferFromS3 final : public WriteBufferFromFileDecorator<WriteBufferFromS3>
+class WriteIndirectBufferFromS3 final : public WriteBufferFromFileDecorator
 {
 public:
     WriteIndirectBufferFromS3(
         std::unique_ptr<WriteBufferFromS3> impl_,
         DiskS3::Metadata metadata_,
-        const String & s3_path_)
+        String & s3_path_)
         : WriteBufferFromFileDecorator(std::move(impl_))
         , metadata(std::move(metadata_))
         , s3_path(s3_path_)
@@ -695,7 +695,7 @@ std::unique_ptr<WriteBufferFromFileBase> DiskS3::writeFile(const String & path,
         std::move(object_metadata),
         buf_size);
 
-    return std::make_unique<WriteIndirectBufferFromS3>(std::move(s3_buffer), std::move(metadata), std::move(s3_path));
+    return std::make_unique<WriteIndirectBufferFromS3>(std::move(s3_buffer), std::move(metadata), s3_path);
 }
 
 void DiskS3::removeMeta(const String & path, AwsS3KeyKeeper & keys)
diff --git a/src/IO/WriteBufferFromFileDecorator.cpp b/src/IO/WriteBufferFromFileDecorator.cpp
index fbb970ee324..757b0dd583e 100644
--- a/src/IO/WriteBufferFromFileDecorator.cpp
+++ b/src/IO/WriteBufferFromFileDecorator.cpp
@@ -5,13 +5,13 @@
 namespace DB
 {
 
-WriteBufferFromFileDecorator<WriteBuffer>::WriteBufferFromFileDecorator(std::unique_ptr<WriteBuffer> impl_)
+WriteBufferFromFileDecorator::WriteBufferFromFileDecorator(std::unique_ptr<WriteBuffer> impl_)
     : WriteBufferFromFileBase(0, nullptr, 0), impl(std::move(impl_))
 {
     swap(*impl);
 }
 
-WriteBufferFromFileDecorator<WriteBuffer>::finalize()
+void WriteBufferFromFileDecorator::finalize()
 {
     if (finalized)
         return;
@@ -24,7 +24,7 @@ WriteBufferFromFileDecorator<WriteBuffer>::finalize()
     finalized = true;
 }
 
-WriteBufferFromFileDecorator<WriteBuffer>::~WriteBufferFromFileDecorator()
+WriteBufferFromFileDecorator::~WriteBufferFromFileDecorator()
 {
     try
     {
@@ -36,19 +36,19 @@ WriteBufferFromFileDecorator<WriteBuffer>::~WriteBufferFromFileDecorator()
     }
 }
 
-void WriteBufferFromFileDecorator<WriteBuffer>::sync()
+void WriteBufferFromFileDecorator::sync()
 {
     impl->sync();
 }
 
-std::string WriteBufferFromFileDecorator<WriteBuffer>::getFileName() const
+std::string WriteBufferFromFileDecorator::getFileName() const
 {
-    if (auto & buffer = dynamic_cast<WriteBufferFromFileBase&>(*impl))
-        return buffer.getFileName();
+    if (WriteBufferFromFileBase * buffer = dynamic_cast<WriteBufferFromFileBase*>(impl.get()))
+        return buffer->getFileName();
     return std::string();
 }
 
-void WriteBufferFromFileDecorator<WriteBuffer>::nextImpl()
+void WriteBufferFromFileDecorator::nextImpl()
 {
     swap(*impl);
     impl->next();