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

clickhouse: fixed FINAL ans SAMPLE broken by some changes in Expression [#CONV-7363].

Browse Source
This commit is contained in:
Michael Kolupaev 2013-05-15 09:55:09 +00:00
parent b6a3c6a5b7
commit e03e85184f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/src/Storages/StorageMergeTree.cpp
View File

@ -210,7 +210,7 @@ BlockInputStreams StorageMergeTree::read(
filter_function->arguments = filter_function_args; filter_function->arguments = filter_function_args;
filter_function->children.push_back(filter_function->arguments); filter_function->children.push_back(filter_function->arguments);
filter_expression = new Expression(filter_function, context); filter_expression = new Expression(filter_function, context, *columns);
/// Добавим столбцы, нужные для sampling_expression. /// Добавим столбцы, нужные для sampling_expression.
std::vector<String> add_columns = filter_expression->getRequiredColumns(); std::vector<String> add_columns = filter_expression->getRequiredColumns();
@ -447,7 +447,7 @@ void StorageMergeTree::createPositiveSignCondition(ExpressionPtr & out_expressio
one->type = new DataTypeInt8; one->type = new DataTypeInt8;
one->value = Field(static_cast<Int64>(1)); one->value = Field(static_cast<Int64>(1));
out_expression = new Expression(function_ptr, context); out_expression = new Expression(function_ptr, context, *columns);
out_column = function->getColumnName(); out_column = function->getColumnName();
} }