thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-21 01:00:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed tests

Browse Source
This commit is contained in:
Maksim Kita 2022-02-16 14:01:42 +00:00 committed by Maksim Kita
parent b3b46d2e5c
commit ce92f6aab1
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Interpreters/MergeJoin.cpp
View File

@ -590,7 +590,7 @@ void MergeJoin::mergeInMemoryRightBlocks()
/// TODO: there should be no split keys by blocks for RIGHT|FULL JOIN
builder.addTransform(std::make_shared<MergeSortingTransform>(
builder.getHeader(), right_sort_description, true, max_rows_in_right_block, 0, 0, 0, 0, nullptr, 0));
builder.getHeader(), right_sort_description, false, max_rows_in_right_block, 0, 0, 0, 0, nullptr, 0));
auto pipeline = QueryPipelineBuilder::getPipeline(std::move(builder));
PullingPipelineExecutor executor(pipeline);

8
src/Interpreters/SortedBlocksWriter.cpp
View File

@ -137,7 +137,7 @@ SortedBlocksWriter::TmpFilePtr SortedBlocksWriter::flush(const BlocksList & bloc
pipeline.getHeader(),
pipeline.getNumStreams(),
sort_description,
true,
false,
rows_in_block);
pipeline.addTransform(std::move(transform));
@ -192,7 +192,7 @@ SortedBlocksWriter::PremergedFiles SortedBlocksWriter::premerge()
pipeline.getHeader(),
pipeline.getNumStreams(),
sort_description,
true,
false,
rows_in_block);
pipeline.addTransform(std::move(transform));
@ -225,7 +225,7 @@ SortedBlocksWriter::SortedFiles SortedBlocksWriter::finishMerge(std::function<vo
pipeline.getHeader(),
pipeline.getNumStreams(),
sort_description,
true,
false,
rows_in_block);
pipeline.addTransform(std::move(transform));
@ -307,7 +307,7 @@ Block SortedBlocksBuffer::mergeBlocks(Blocks && blocks) const
builder.getHeader(),
builder.getNumStreams(),
sort_description,
true,
false,
num_rows);
builder.addTransform(std::move(transform));

4
src/QueryPipeline/tests/gtest_blocks_size_merging_streams.cpp
View File

@ -83,7 +83,7 @@ TEST(MergingSortedTest, SimpleBlockSizeTest)
EXPECT_EQ(pipe.numOutputPorts(), 3);
auto transform = std::make_shared<MergingSortedTransform>(pipe.getHeader(), pipe.numOutputPorts(), sort_description,
DEFAULT_MERGE_BLOCK_SIZE, 0, false, nullptr, false, true);
false, DEFAULT_MERGE_BLOCK_SIZE, false, nullptr, false, true);
pipe.addTransform(std::move(transform));
@ -130,7 +130,7 @@ TEST(MergingSortedTest, MoreInterestingBlockSizes)
EXPECT_EQ(pipe.numOutputPorts(), 3);
auto transform = std::make_shared<MergingSortedTransform>(pipe.getHeader(), pipe.numOutputPorts(), sort_description,
DEFAULT_MERGE_BLOCK_SIZE, 0, false, nullptr, false, true);
false, DEFAULT_MERGE_BLOCK_SIZE, false, nullptr, false, true);
pipe.addTransform(std::move(transform));

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

@ -802,7 +802,7 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream()
{
case MergeTreeData::MergingParams::Ordinary:
merged_transform = std::make_shared<MergingSortedTransform>(
header, pipes.size(), sort_description, merge_block_size, 0, compile_sort_description, ctx->rows_sources_write_buf.get(), true, ctx->blocks_are_granules_size);
header, pipes.size(), sort_description, compile_sort_description, merge_block_size, 0, ctx->rows_sources_write_buf.get(), true, ctx->blocks_are_granules_size);
break;
case MergeTreeData::MergingParams::Collapsing: