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

Revert "Revert "Revert "make d-tor Finalizer more obvious"""

Browse Source
This commit is contained in:
Sema Checherinda 2024-12-06 12:52:03 +01:00 committed by GitHub
parent 02f27e53f7
commit 3034a97631
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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();

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

@ -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__);
}
}

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

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

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

@ -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();