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

Fix style

Browse Source
This commit is contained in:
Pavel Kruglov 2020-10-13 22:53:36 +03:00
parent be0cb31d21
commit 44c2b138f3
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
View File

@ -1314,7 +1314,8 @@ Pipe MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreamsFinal(
continue; continue;
} }
pipe.addSimpleTransform([&metadata_snapshot](const Block & header) { pipe.addSimpleTransform([&metadata_snapshot](const Block & header)
{
return std::make_shared<ExpressionTransform>(header, metadata_snapshot->getSortingKey().expression); return std::make_shared<ExpressionTransform>(header, metadata_snapshot->getSortingKey().expression);
}); });
@ -1329,7 +1330,8 @@ Pipe MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreamsFinal(
for (size_t i = 0; i < sort_columns_size; ++i) for (size_t i = 0; i < sort_columns_size; ++i)
sort_description.emplace_back(header.getPositionByName(sort_columns[i]), 1, 1); sort_description.emplace_back(header.getPositionByName(sort_columns[i]), 1, 1);
auto get_merging_processor = [&]() -> MergingTransformPtr { auto get_merging_processor = [&]() -> MergingTransformPtr
{
switch (data.merging_params.mode) switch (data.merging_params.mode)
{ {
case MergeTreeData::MergingParams::Ordinary: { case MergeTreeData::MergingParams::Ordinary: {
@ -1385,11 +1387,13 @@ Pipe MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreamsFinal(
key_columns.emplace_back(desc.column_number); key_columns.emplace_back(desc.column_number);
} }
pipe.addSimpleTransform([&](const Block & stream_header) { pipe.addSimpleTransform([&](const Block & stream_header)
{
return std::make_shared<AddingSelectorTransform>(stream_header, num_streams, key_columns); return std::make_shared<AddingSelectorTransform>(stream_header, num_streams, key_columns);
}); });
pipe.transform([&](OutputPortRawPtrs ports) { pipe.transform([&](OutputPortRawPtrs ports)
{
Processors processors; Processors processors;
std::vector<OutputPorts::iterator> output_ports; std::vector<OutputPorts::iterator> output_ports;
processors.reserve(ports.size() + num_streams); processors.reserve(ports.size() + num_streams);