thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support SAMPLE and FINAL together in MergeTree.

Browse Source
This commit is contained in:
Nikolai Kochetov 2019-11-25 15:57:14 +03:00
parent 9b42e9341d
commit d3118f0a76
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -459,10 +459,11 @@ Pipes MergeTreeDataSelectExecutor::readFromParts(
ASTPtr sampling_key_ast = data.getSamplingKeyAST();
if (select.final())
{
auto sampling_column_name = sampling_key_ast->getColumnName();
sampling_key_ast = std::make_shared<ASTIdentifier>(sampling_column_name);
sampling_key_ast = std::make_shared<ASTIdentifier>(data.sampling_expr_column_name);
/// We do spoil available_real_columns here, but it is not used later.
available_real_columns.emplace_back(std::move(sampling_column_name));
auto sampling_column_type = data.primary_key_sample.getByName(data.sampling_expr_column_name).type;
available_real_columns.emplace_back(data.sampling_expr_column_name, std::move(type));
}
if (has_lower_limit)