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

Edit reverse order

Browse Source
This commit is contained in:
Anastasiya Rodigina 2019-05-25 14:09:23 +03:00
parent c8d4952702
commit 6c779e63b0
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1463,6 +1463,16 @@ void InterpreterSelectQuery::executeOrder(Pipeline & pipeline, SelectQueryInfo &
} }
} }
query_info.do_not_steal_task = false;
query_info.read_in_pk_order = true;
if (order_direction == -1)
{
query_info.read_in_reverse_order = true;
pipeline.transform([&](auto & stream)
{
stream = std::make_shared<ReverseBlockInputStream>(stream);
});
}
if (need_sorting) if (need_sorting)
{ {
if (!prefix_order_descr.empty()) if (!prefix_order_descr.empty())
@ -1494,16 +1504,6 @@ void InterpreterSelectQuery::executeOrder(Pipeline & pipeline, SelectQueryInfo &
} }
} }
// in order to read blocks in fixed order
query_info.do_not_steal_task = true;
query_info.read_in_pk_order = true;
if (order_direction == -1)
{
pipeline.transform([&](auto & stream)
{
stream = std::make_shared<ReverseBlockInputStream>(stream);
});
}
executeUnion(pipeline); executeUnion(pipeline);
pipeline.firstStream() = std::make_shared<MergeSortingBlockInputStream>( pipeline.firstStream() = std::make_shared<MergeSortingBlockInputStream>(
pipeline.firstStream(), order_descr, settings.max_block_size, limit, pipeline.firstStream(), order_descr, settings.max_block_size, limit,

7
dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
View File

@ -43,6 +43,7 @@ namespace std
#include <DataStreams/NullBlockInputStream.h> #include <DataStreams/NullBlockInputStream.h>
#include <DataStreams/SummingSortedBlockInputStream.h> #include <DataStreams/SummingSortedBlockInputStream.h>
#include <DataStreams/ReplacingSortedBlockInputStream.h> #include <DataStreams/ReplacingSortedBlockInputStream.h>
#include <DataStreams/ReverseBlockInputStream.h>
#include <DataStreams/AggregatingSortedBlockInputStream.h> #include <DataStreams/AggregatingSortedBlockInputStream.h>
#include <DataStreams/VersionedCollapsingSortedBlockInputStream.h> #include <DataStreams/VersionedCollapsingSortedBlockInputStream.h>
#include <DataTypes/DataTypesNumber.h> #include <DataTypes/DataTypesNumber.h>
@ -839,7 +840,11 @@ BlockInputStreams MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreamsPKOrd
for (size_t part_index = 0; part_index < parts.size(); ++part_index) for (size_t part_index = 0; part_index < parts.size(); ++part_index)
{ {
RangesInDataPart & part = parts[part_index]; size_t index = part_index;
if (query_info.read_in_reverse_order)
index = parts.size() - part_index - 1;
RangesInDataPart & part = parts[index];
BlockInputStreamPtr source_stream = std::make_shared<MergeTreeSelectBlockInputStream>( BlockInputStreamPtr source_stream = std::make_shared<MergeTreeSelectBlockInputStream>(
data, part.data_part, max_block_size, settings.preferred_block_size_bytes, data, part.data_part, max_block_size, settings.preferred_block_size_bytes,

1
dbms/src/Storages/SelectQueryInfo.h
View File

@ -55,6 +55,7 @@ struct SelectQueryInfo
/// each of them will read data in sorted by sorting key order. /// each of them will read data in sorted by sorting key order.
bool do_not_steal_task = false; bool do_not_steal_task = false;
bool read_in_pk_order = false; bool read_in_pk_order = false;
bool read_in_reverse_order = false;
/// Prepared sets are used for indices by storage engine. /// Prepared sets are used for indices by storage engine.
/// Example: x IN (1, 2, 3) /// Example: x IN (1, 2, 3)