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

Fix tests and change pipeline

Browse Source
This commit is contained in:
Anastasiya Rodigina 2019-05-09 18:44:51 +03:00
parent 63b3d7dbdb
commit 23a8efe367
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
dbms/src/Interpreters/InterpreterSelectQuery.cpp
View File

@ -1465,25 +1465,39 @@ void InterpreterSelectQuery::executeOrder(Pipeline & pipeline, SelectQueryInfo &
if (need_sorting) if (need_sorting)
{ {
pipeline.transform([&](auto & stream) if (!prefix_order_descr.empty())
{ {
stream = std::make_shared<FinishSortingBlockInputStream>( pipeline.transform([&](auto & stream)
stream, {
prefix_order_descr, stream = std::make_shared<FinishSortingBlockInputStream>(
order_descr, stream,
settings.max_block_size, prefix_order_descr,
limit); order_descr,
}); settings.max_block_size,
limit);
});
}
else
{
pipeline.transform([&](auto & stream)
{
auto sorting_stream = std::make_shared<PartialSortingBlockInputStream>(stream, order_descr, limit);
/// Limits on sorting
IBlockInputStream::LocalLimits limits;
limits.mode = IBlockInputStream::LIMITS_TOTAL;
limits.size_limits = SizeLimits(settings.max_rows_to_sort, settings.max_bytes_to_sort, settings.sort_overflow_mode);
sorting_stream->setLimits(limits);
stream = sorting_stream;
});
}
} }
// in order to read blocks in fixed order // in order to read blocks in fixed order
query_info.do_not_steal_task = true; query_info.do_not_steal_task = true;
if (order_direction == -1) if (order_direction == -1)
{ {
pipeline.transform([&](auto & stream)
{
stream = std::make_shared<AsynchronousBlockInputStream>(stream);
});
pipeline.transform([&](auto & stream) pipeline.transform([&](auto & stream)
{ {
stream = std::make_shared<ReverseBlockInputStream>(stream); stream = std::make_shared<ReverseBlockInputStream>(stream);
@ -1499,8 +1513,10 @@ void InterpreterSelectQuery::executeOrder(Pipeline & pipeline, SelectQueryInfo &
if (settings.optimize_pk_order) if (settings.optimize_pk_order)
{ {
if (const auto * merge_tree = dynamic_cast<const MergeTreeData *>(storage.get())) if (const auto * merge_tree = dynamic_cast<const MergeTreeData *>(storage.get()))
{
optimize_pk_order(*merge_tree); optimize_pk_order(*merge_tree);
return; return;
}
} }
pipeline.transform([&](auto & stream) pipeline.transform([&](auto & stream)