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

Fix build and style issues

Browse Source
This commit is contained in:
Anastasiya Rodigina 2019-04-18 01:58:24 +03:00
parent 0c1735f1b1
commit ef0be2a721
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/src/DataStreams/ReverseBlockInputStream.h
View File

@ -1,12 +1,12 @@
#pragma once
#include <DataStreams/IProfilingBlockInputStream.h>
#include <DataStreams/IBlockInputStream.h>
#include <Common/PODArray.h>
namespace DB
{
class ReverseBlockInputStream : public IProfilingBlockInputStream
class ReverseBlockInputStream : public IBlockInputStream
{
public:
ReverseBlockInputStream(const BlockInputStreamPtr& input);

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

@ -892,7 +892,8 @@ static UInt64 getLimitForSorting(const ASTSelectQuery & query, const Context & c
void InterpreterSelectQuery::executeFetchColumns(
QueryProcessingStage::Enum processing_stage, Pipeline & pipeline,
const PrewhereInfoPtr & prewhere_info, const Names & columns_to_remove_after_prewhere)
const PrewhereInfoPtr & prewhere_info, const Names & columns_to_remove_after_prewhere,
SelectQueryInfo& query_info)
{
auto & query = getSelectQuery();
const Settings & settings = context.getSettingsRef();
@ -1142,7 +1143,6 @@ void InterpreterSelectQuery::executeFetchColumns(
if (max_streams > 1 && !is_remote)
max_streams *= settings.max_streams_to_max_threads_ratio;
SelectQueryInfo query_info;
query_info.query = query_ptr;
query_info.syntax_analyzer_result = syntax_analyzer_result;
query_info.sets = query_analyzer->getPreparedSets();
@ -1446,7 +1446,7 @@ void InterpreterSelectQuery::executeOrder(Pipeline & pipeline, SelectQueryInfo&
{
bool need_sorting = false;
const auto& sorting_key_order = storage_merge_tree->getSortingKeyColumns();
if (!(sorting_key_order.size() < order_descr.size()) && !query.limit_by_value && !query.group_expression_list)
if (!(sorting_key_order.size() < order_descr.size()) && !query.limitByValue() && !query.groupBy())
{
for (size_t i = 0; i < order_descr.size(); ++i)
{
@ -1473,7 +1473,7 @@ void InterpreterSelectQuery::executeOrder(Pipeline & pipeline, SelectQueryInfo&
{
stream = std::make_shared<ReverseBlockInputStream>(stream);
});
}
}
executeUnion(pipeline);
pipeline.firstStream() = std::make_shared<MergeSortingBlockInputStream>(
pipeline.firstStream(), order_descr, settings.max_block_size, limit,
@ -1481,7 +1481,7 @@ void InterpreterSelectQuery::executeOrder(Pipeline & pipeline, SelectQueryInfo&
settings.max_bytes_before_external_sort, context.getTemporaryPath());
return;
}
}
}
}
pipeline.transform([&](auto & stream)