thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-13 11:04:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better

Browse Source
This commit is contained in:
Antonio Andelic 2023-06-30 11:51:20 +00:00
parent 96cc02ae0c
commit 9a79fd6f70
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Processors/Transforms/ExpressionTransform.cpp
View File

@ -39,7 +39,6 @@ void ConvertingTransform::onConsume(Chunk chunk)
expression->execute(block, num_rows);
chunk.setColumns(block.getColumns(), num_rows);
chunk.setChunkInfo(chunk.getChunkInfo());
cur_chunk = std::move(chunk);
}

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

@ -7,8 +7,8 @@
#include <Common/SipHash.h>
#include <Common/ZooKeeper/KeeperException.h>
#include <Common/ThreadFuzzer.h>
#include "Storages/MergeTree/MergeAlgorithm.h"
#include "Storages/MergeTree/MergeTreeDataWriter.h"
#include <Storages/MergeTree/MergeAlgorithm.h>
#include <Storages/MergeTree/MergeTreeDataWriter.h>
#include <Storages/MergeTree/AsyncBlockIDsCache.h>
#include <DataTypes/ObjectUtils.h>
#include <Core/Block.h>
@ -451,8 +451,9 @@ void ReplicatedMergeTreeSinkImpl<async_insert>::consume(Chunk chunk)
if constexpr (async_insert)
{
/// we copy everything but offsets which we move because they are only used by async insert
if (storage.writer.getMergingMode() != MergeTreeData::MergingParams::Mode::Ordinary)
unmerged_block.emplace(current_block);
unmerged_block.emplace(Block(current_block.block), Row(current_block.partition), std::move(current_block.offsets));
}
/// Write part to the filesystem under temporary name. Calculate a checksum.