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

Try fix build.

Browse Source
This commit is contained in:
Nikolai Kochetov 2020-06-01 19:58:36 +03:00
parent 3a0acb00c1
commit 325393d340
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Interpreters/InterpreterSelectQuery.cpp
View File

@ -1,5 +1,4 @@
#include <DataStreams/ExpressionBlockInputStream.h>
#include <DataStreams/AggregatingBlockInputStream.h>
#include <DataStreams/MergingAggregatedBlockInputStream.h>
#include <DataStreams/OneBlockInputStream.h>
#include <DataStreams/copyData.h>

19
src/Interpreters/MergeJoin.cpp
View File

@ -8,8 +8,12 @@
#include <Interpreters/sortBlock.h>
#include <Interpreters/join_common.h>
#include <DataStreams/materializeBlock.h>
#include <DataStreams/MergeSortingBlockInputStream.h>
#include <DataStreams/TemporaryFileStream.h>
#include <Processors/Sources/SourceFromInputStream.h>
#include <DataStreams/OneBlockInputStream.h>
#include <Processors/QueryPipeline.h>
#include <Processors/Transforms/MergeSortingTransform.h>
#include <Processors/Executors/PipelineExecutingBlockInputStream.h>
namespace DB
{
@ -442,8 +446,19 @@ void MergeJoin::mergeInMemoryRightBlocks()
Blocks blocks_to_merge = blocksListToBlocks(right_blocks.blocks);
right_blocks.clear();
Pipes sources;
for (auto & block : blocks_to_merge)
{
sources.emplace_back(std::make_shared<SourceFromInputStream>(std::make_shared<OneBlockInputStream>(std::move(block))));
}
QueryPipeline pipeline;
pipeline.init(std::move(sources));
/// TODO: there should be no splitted keys by blocks for RIGHT|FULL JOIN
MergeSortingBlocksBlockInputStream sorted_input(blocks_to_merge, right_sort_description, max_rows_in_right_block);
pipeline.addPipe({std::make_shared<MergeSortingTransform>(pipeline.getHeader(), right_sort_description, max_rows_in_right_block, 0, 0, 0, nullptr, 0)});
auto sorted_input = PipelineExecutingBlockInputStream(std::move(pipeline));
while (Block block = sorted_input.read())
{

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

@ -13,7 +13,6 @@
#include <DataStreams/DistinctSortedBlockInputStream.h>
#include <DataStreams/ExpressionBlockInputStream.h>
#include <DataStreams/MaterializingBlockInputStream.h>
#include <DataStreams/ConcatBlockInputStream.h>
#include <DataStreams/ColumnGathererStream.h>
#include <Processors/Merges/MergingSortedTransform.h>
#include <Processors/Merges/CollapsingSortedTransform.h>

1
src/Storages/StorageMerge.cpp
View File

@ -1,4 +1,3 @@
#include <DataStreams/AddingConstColumnBlockInputStream.h>
#include <DataStreams/narrowBlockInputStreams.h>
#include <DataStreams/LazyBlockInputStream.h>
#include <DataStreams/NullBlockInputStream.h>