From 3034a97631a3bab25c7a01d88b50a7e28344d5ee Mon Sep 17 00:00:00 2001
From: Sema Checherinda <104093494+CheSema@users.noreply.github.com>
Date: Fri, 6 Dec 2024 12:52:03 +0100
Subject: [PATCH] Revert "Revert "Revert "make d-tor Finalizer more obvious"""

---
 src/Storages/MergeTree/MergeTreeSink.cpp        |  3 ---
 .../MergeTree/MergedBlockOutputStream.cpp       | 17 ++++++++++++-----
 .../MergeTree/MergedBlockOutputStream.h         |  2 +-
 .../MergeTree/ReplicatedMergeTreeSink.cpp       |  2 --
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/Storages/MergeTree/MergeTreeSink.cpp b/src/Storages/MergeTree/MergeTreeSink.cpp
index 582a722d678..d65d1f3212f 100644
--- a/src/Storages/MergeTree/MergeTreeSink.cpp
+++ b/src/Storages/MergeTree/MergeTreeSink.cpp
@@ -1,4 +1,3 @@
-#include <exception>
 #include <Storages/MergeTree/MergeTreeSink.h>
 #include <Storages/StorageMergeTree.h>
 #include <Interpreters/PartLog.h>
@@ -45,8 +44,6 @@ MergeTreeSink::~MergeTreeSink()
     if (!delayed_chunk)
         return;
 
-    chassert(isCancelled() || std::uncaught_exceptions());
-
     for (auto & partition : delayed_chunk->partitions)
     {
         partition.temp_part.cancel();
diff --git a/src/Storages/MergeTree/MergedBlockOutputStream.cpp b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
index 87b3d238e3b..f8863a8a6d6 100644
--- a/src/Storages/MergeTree/MergedBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
@@ -119,7 +119,7 @@ struct MergedBlockOutputStream::Finalizer::Impl
     }
 
     void finish();
-    void cancel() noexcept;
+    void cancel();
 };
 
 void MergedBlockOutputStream::Finalizer::finish()
@@ -130,7 +130,7 @@ void MergedBlockOutputStream::Finalizer::finish()
         to_finish->finish();
 }
 
-void MergedBlockOutputStream::Finalizer::cancel() noexcept
+void MergedBlockOutputStream::Finalizer::cancel()
 {
     std::unique_ptr<Impl> to_cancel = std::move(impl);
     impl.reset();
@@ -167,7 +167,7 @@ void MergedBlockOutputStream::Finalizer::Impl::finish()
         part->getDataPartStorage().removeFile(file_name);
 }
 
-void MergedBlockOutputStream::Finalizer::Impl::cancel() noexcept
+void MergedBlockOutputStream::Finalizer::Impl::cancel()
 {
     writer.cancel();
 
@@ -183,8 +183,15 @@ MergedBlockOutputStream::Finalizer::Finalizer(std::unique_ptr<Impl> impl_) : imp
 
 MergedBlockOutputStream::Finalizer::~Finalizer()
 {
-    if (impl)
-        cancel();
+    try
+    {
+        if (impl)
+            finish();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
 }
 
 
diff --git a/src/Storages/MergeTree/MergedBlockOutputStream.h b/src/Storages/MergeTree/MergedBlockOutputStream.h
index 2f6205427d1..b6fc13cbe42 100644
--- a/src/Storages/MergeTree/MergedBlockOutputStream.h
+++ b/src/Storages/MergeTree/MergedBlockOutputStream.h
@@ -55,7 +55,7 @@ public:
         ~Finalizer();
 
         void finish();
-        void cancel() noexcept;
+        void cancel();
     };
 
     /// Finalize writing part and fill inner structures
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
index 507b4bfd214..19a69eb46be 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
@@ -179,8 +179,6 @@ ReplicatedMergeTreeSinkImpl<async_insert>::~ReplicatedMergeTreeSinkImpl()
     if (!delayed_chunk)
         return;
 
-    chassert(isCancelled() || std::uncaught_exceptions());
-
     for (auto & partition : delayed_chunk->partitions)
     {
         partition.temp_part.cancel();