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

Backport #72386 to 24.10: fix finalize/cancel write buffers

Browse Source
This commit is contained in:
robot-clickhouse 2024-12-12 17:13:58 +00:00
parent f66e8b8047
commit 6c0af11f41
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Storages/ObjectStorage/StorageObjectStorageSink.cpp
View File

@ -74,6 +74,7 @@ void StorageObjectStorageSink::finalizeBuffers()
catch (...)
{
/// Stop ParallelFormattingOutputFormat correctly.
cancelBuffers();
releaseBuffers();
throw;
}

2
src/Storages/StorageMemory.cpp
View File

@ -561,7 +561,7 @@ void StorageMemory::restoreDataImpl(const BackupPtr & backup, const String & dat
temp_data_file.emplace(temporary_disk);
auto out = std::make_unique<WriteBufferFromFile>(temp_data_file->getAbsolutePath());
copyData(*in, *out);
out.reset();
out->finalize();
in = createReadBufferFromFileBase(temp_data_file->getAbsolutePath(), {});
}
std::unique_ptr<ReadBufferFromFileBase> in_from_file{static_cast<ReadBufferFromFileBase *>(in.release())};