mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-21 09:10:48 +00:00
Fixed tests
This commit is contained in:
parent
b3b46d2e5c
commit
ce92f6aab1
@ -590,7 +590,7 @@ void MergeJoin::mergeInMemoryRightBlocks()
|
|||||||
|
|
||||||
/// TODO: there should be no split keys by blocks for RIGHT|FULL JOIN
|
/// TODO: there should be no split keys by blocks for RIGHT|FULL JOIN
|
||||||
builder.addTransform(std::make_shared<MergeSortingTransform>(
|
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));
|
auto pipeline = QueryPipelineBuilder::getPipeline(std::move(builder));
|
||||||
PullingPipelineExecutor executor(pipeline);
|
PullingPipelineExecutor executor(pipeline);
|
||||||
|
@ -137,7 +137,7 @@ SortedBlocksWriter::TmpFilePtr SortedBlocksWriter::flush(const BlocksList & bloc
|
|||||||
pipeline.getHeader(),
|
pipeline.getHeader(),
|
||||||
pipeline.getNumStreams(),
|
pipeline.getNumStreams(),
|
||||||
sort_description,
|
sort_description,
|
||||||
true,
|
false,
|
||||||
rows_in_block);
|
rows_in_block);
|
||||||
|
|
||||||
pipeline.addTransform(std::move(transform));
|
pipeline.addTransform(std::move(transform));
|
||||||
@ -192,7 +192,7 @@ SortedBlocksWriter::PremergedFiles SortedBlocksWriter::premerge()
|
|||||||
pipeline.getHeader(),
|
pipeline.getHeader(),
|
||||||
pipeline.getNumStreams(),
|
pipeline.getNumStreams(),
|
||||||
sort_description,
|
sort_description,
|
||||||
true,
|
false,
|
||||||
rows_in_block);
|
rows_in_block);
|
||||||
|
|
||||||
pipeline.addTransform(std::move(transform));
|
pipeline.addTransform(std::move(transform));
|
||||||
@ -225,7 +225,7 @@ SortedBlocksWriter::SortedFiles SortedBlocksWriter::finishMerge(std::function<vo
|
|||||||
pipeline.getHeader(),
|
pipeline.getHeader(),
|
||||||
pipeline.getNumStreams(),
|
pipeline.getNumStreams(),
|
||||||
sort_description,
|
sort_description,
|
||||||
true,
|
false,
|
||||||
rows_in_block);
|
rows_in_block);
|
||||||
|
|
||||||
pipeline.addTransform(std::move(transform));
|
pipeline.addTransform(std::move(transform));
|
||||||
@ -307,7 +307,7 @@ Block SortedBlocksBuffer::mergeBlocks(Blocks && blocks) const
|
|||||||
builder.getHeader(),
|
builder.getHeader(),
|
||||||
builder.getNumStreams(),
|
builder.getNumStreams(),
|
||||||
sort_description,
|
sort_description,
|
||||||
true,
|
false,
|
||||||
num_rows);
|
num_rows);
|
||||||
|
|
||||||
builder.addTransform(std::move(transform));
|
builder.addTransform(std::move(transform));
|
||||||
|
@ -83,7 +83,7 @@ TEST(MergingSortedTest, SimpleBlockSizeTest)
|
|||||||
EXPECT_EQ(pipe.numOutputPorts(), 3);
|
EXPECT_EQ(pipe.numOutputPorts(), 3);
|
||||||
|
|
||||||
auto transform = std::make_shared<MergingSortedTransform>(pipe.getHeader(), pipe.numOutputPorts(), sort_description,
|
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));
|
pipe.addTransform(std::move(transform));
|
||||||
|
|
||||||
@ -130,7 +130,7 @@ TEST(MergingSortedTest, MoreInterestingBlockSizes)
|
|||||||
EXPECT_EQ(pipe.numOutputPorts(), 3);
|
EXPECT_EQ(pipe.numOutputPorts(), 3);
|
||||||
|
|
||||||
auto transform = std::make_shared<MergingSortedTransform>(pipe.getHeader(), pipe.numOutputPorts(), sort_description,
|
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));
|
pipe.addTransform(std::move(transform));
|
||||||
|
|
||||||
|
@ -802,7 +802,7 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream()
|
|||||||
{
|
{
|
||||||
case MergeTreeData::MergingParams::Ordinary:
|
case MergeTreeData::MergingParams::Ordinary:
|
||||||
merged_transform = std::make_shared<MergingSortedTransform>(
|
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;
|
break;
|
||||||
|
|
||||||
case MergeTreeData::MergingParams::Collapsing:
|
case MergeTreeData::MergingParams::Collapsing:
|
||||||
|
Loading…
Reference in New Issue
Block a user