Revert "make d-tor Finalizer more obvious"

CheSema · web-flow · commit 043d6e7bbfb3 · 2024-11-29T20:37:03.000+01:00
diff --git a/src/Storages/MergeTree/MergeTreeSink.cpp b/src/Storages/MergeTree/MergeTreeSink.cpp
@@ -44,8 +44,6 @@ MergeTreeSink::~MergeTreeSink()
     if (!delayed_chunk)
         return;
 
-    chassert(isCancelled());
-
     for (auto & partition : delayed_chunk->partitions)
     {
         partition.temp_part.cancel();
diff --git a/src/Storages/MergeTree/MergedBlockOutputStream.cpp b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
@@ -118,7 +118,7 @@ struct MergedBlockOutputStream::Finalizer::Impl
     }
 
     void finish();
-    void cancel() noexcept;
+    void cancel();
 };
 
 void MergedBlockOutputStream::Finalizer::finish()
@@ -129,7 +129,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();
@@ -166,7 +166,7 @@ void MergedBlockOutputStream::Finalizer::Impl::finish()
         part->getDataPartStorage().removeFile(file_name);
 }
 
-void MergedBlockOutputStream::Finalizer::Impl::cancel() noexcept
+void MergedBlockOutputStream::Finalizer::Impl::cancel()
 {
     writer.cancel();
 
@@ -182,8 +182,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
@@ -54,7 +54,7 @@ class MergedBlockOutputStream final : public IMergedBlockOutputStream
         ~Finalizer();
 
         void finish();
-        void cancel() noexcept;
+        void cancel();
     };
 
     /// Finalize writing part and fill inner structures

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,6 @@ MergeTreeSink::~MergeTreeSink()`
`44`	`44`	`if (!delayed_chunk)`
`45`	`45`	`return;`
`46`	`46`
`47`		`- chassert(isCancelled());`
`48`		`-`
`49`	`47`	`for (auto & partition : delayed_chunk->partitions)`
`50`	`48`	`{`
`51`	`49`	`partition.temp_part.cancel();`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ struct MergedBlockOutputStream::Finalizer::Impl`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`void finish();`
`121`		`- void cancel() noexcept;`
	`121`	`+ void cancel();`
`122`	`122`	`};`
`123`	`123`
`124`	`124`	`void MergedBlockOutputStream::Finalizer::finish()`
`@@ -129,7 +129,7 @@ void MergedBlockOutputStream::Finalizer::finish()`
`129`	`129`	`to_finish->finish();`
`130`	`130`	`}`
`131`	`131`
`132`		`-void MergedBlockOutputStream::Finalizer::cancel() noexcept`
	`132`	`+void MergedBlockOutputStream::Finalizer::cancel()`
`133`	`133`	`{`
`134`	`134`	`std::unique_ptr<Impl> to_cancel = std::move(impl);`
`135`	`135`	`impl.reset();`
`@@ -166,7 +166,7 @@ void MergedBlockOutputStream::Finalizer::Impl::finish()`
`166`	`166`	`part->getDataPartStorage().removeFile(file_name);`
`167`	`167`	`}`
`168`	`168`
`169`		`-void MergedBlockOutputStream::Finalizer::Impl::cancel() noexcept`
	`169`	`+void MergedBlockOutputStream::Finalizer::Impl::cancel()`
`170`	`170`	`{`
`171`	`171`	`writer.cancel();`
`172`	`172`
`@@ -182,8 +182,15 @@ MergedBlockOutputStream::Finalizer::Finalizer(std::unique_ptr<Impl> impl_) : imp`
`182`	`182`
`183`	`183`	`MergedBlockOutputStream::Finalizer::~Finalizer()`
`184`	`184`	`{`
`185`		`- if (impl)`
`186`		`- cancel();`
	`185`	`+ try`
	`186`	`+ {`
	`187`	`+ if (impl)`
	`188`	`+ finish();`
	`189`	`+ }`
	`190`	`+ catch (...)`
	`191`	`+ {`
	`192`	`+ tryLogCurrentException(__PRETTY_FUNCTION__);`
	`193`	`+ }`
`187`	`194`	`}`
`188`	`195`
`189`	`196`