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

Fix tests.

Browse Source
This commit is contained in:
Nikolai Kochetov 2021-10-05 16:58:24 +03:00
parent c106f1e380
commit 96d070a5ba
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Storages/MergeTree/IMergedBlockOutputStream.h
View File

@ -15,8 +15,12 @@ public:
const MergeTreeDataPartPtr & data_part,
const StorageMetadataPtr & metadata_snapshot_);
virtual ~IMergedBlockOutputStream() = default;
using WrittenOffsetColumns = std::set<std::string>;
virtual void write(const Block & block) = 0;
const MergeTreeIndexGranularity & getIndexGranularity() const
{
return writer->getIndexGranularity();

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

@ -24,7 +24,7 @@ public:
Block getHeader() const { return metadata_snapshot->getSampleBlock(); }
/// If the data is pre-sorted.
void write(const Block & block);
void write(const Block & block) override;
/** If the data is not sorted, but we have previously calculated the permutation, that will sort it.
* This method is used to save RAM, since you do not need to keep two blocks at once - the original one and the sorted one.

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

@ -24,7 +24,7 @@ public:
const MergeTreeIndexGranularityInfo * index_granularity_info_ = nullptr);
Block getHeader() const { return header; }
void write(const Block & block);
void write(const Block & block) override;
MergeTreeData::DataPart::Checksums
writeSuffixAndGetChecksums(MergeTreeData::MutableDataPartPtr & new_part, MergeTreeData::DataPart::Checksums & all_checksums, bool sync = false);

1
src/Storages/MergeTree/MutateTask.cpp
View File

@ -793,6 +793,7 @@ bool PartMergerWriter::mutateOriginalPartAndPrepareProjections()
if (ctx->minmax_idx)
ctx->minmax_idx->update(block, ctx->data->getMinMaxColumnsNames(ctx->metadata_snapshot->getPartitionKey()));
ctx->out->write(block);
for (size_t i = 0, size = ctx->projections_to_build.size(); i < size; ++i)
{