thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-12 17:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #72654 from ClickHouse/revert-72642-revert-72395-chesema-dtor-Finalizer

Browse Source 
Revert "Revert "make d-tor Finalizer more obvious""
This commit is contained in:
Sema Checherinda 2024-12-05 16:40:14 +00:00 committed by GitHub
commit e26fb09d00
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Storages/MergeTree/MergeTreeSink.cpp
View File

@ -1,3 +1,4 @@
#include <exception>
#include <Storages/MergeTree/MergeTreeSink.h> #include <Storages/MergeTree/MergeTreeSink.h>
#include <Storages/StorageMergeTree.h> #include <Storages/StorageMergeTree.h>
#include <Interpreters/PartLog.h> #include <Interpreters/PartLog.h>
@ -44,6 +45,8 @@ MergeTreeSink::~MergeTreeSink()
if (!delayed_chunk) if (!delayed_chunk)
return; return;
chassert(isCancelled() || std::uncaught_exceptions());
for (auto & partition : delayed_chunk->partitions) for (auto & partition : delayed_chunk->partitions)
{ {
partition.temp_part.cancel(); partition.temp_part.cancel();

17
src/Storages/MergeTree/MergedBlockOutputStream.cpp
View File

@ -119,7 +119,7 @@ struct MergedBlockOutputStream::Finalizer::Impl
} }
void finish(); void finish();
void cancel(); void cancel() noexcept;
}; };
void MergedBlockOutputStream::Finalizer::finish() void MergedBlockOutputStream::Finalizer::finish()
@ -130,7 +130,7 @@ void MergedBlockOutputStream::Finalizer::finish()
to_finish->finish(); to_finish->finish();
} }
void MergedBlockOutputStream::Finalizer::cancel() void MergedBlockOutputStream::Finalizer::cancel() noexcept
{ {
std::unique_ptr<Impl> to_cancel = std::move(impl); std::unique_ptr<Impl> to_cancel = std::move(impl);
impl.reset(); impl.reset();
@ -167,7 +167,7 @@ void MergedBlockOutputStream::Finalizer::Impl::finish()
part->getDataPartStorage().removeFile(file_name); part->getDataPartStorage().removeFile(file_name);
} }
void MergedBlockOutputStream::Finalizer::Impl::cancel() void MergedBlockOutputStream::Finalizer::Impl::cancel() noexcept
{ {
writer.cancel(); writer.cancel();
@ -183,15 +183,8 @@ MergedBlockOutputStream::Finalizer::Finalizer(std::unique_ptr<Impl> impl_) : imp
MergedBlockOutputStream::Finalizer::~Finalizer() MergedBlockOutputStream::Finalizer::~Finalizer()
{ {
try if (impl)
{ cancel();
if (impl)
finish();
}
catch (...)
{
tryLogCurrentException(__PRETTY_FUNCTION__);
}
} }

2
src/Storages/MergeTree/MergedBlockOutputStream.h
View File

@ -55,7 +55,7 @@ public:
~Finalizer(); ~Finalizer();
void finish(); void finish();
void cancel(); void cancel() noexcept;
}; };
/// Finalize writing part and fill inner structures /// Finalize writing part and fill inner structures

2
src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
View File

@ -179,6 +179,8 @@ ReplicatedMergeTreeSinkImpl<async_insert>::~ReplicatedMergeTreeSinkImpl()
if (!delayed_chunk) if (!delayed_chunk)
return; return;
chassert(isCancelled() || std::uncaught_exceptions());
for (auto & partition : delayed_chunk->partitions) for (auto & partition : delayed_chunk->partitions)
{ {
partition.temp_part.cancel(); partition.temp_part.cancel();