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

fix

Browse Source
This commit is contained in:
Nikita Vasilev 2019-03-07 14:31:23 +03:00
parent a555918fca
commit 01e682d23c
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/src/Storages/MergeTree/KeyCondition.cpp
View File

@ -281,9 +281,9 @@ KeyCondition::KeyCondition(
RPNBuilder<RPNElement>(
query_info, context,
[this] (const ASTPtr & node, const Context & context, Block & block_with_constants, RPNElement & out) -> bool
[this] (const ASTPtr & node, const Context & atom_context, Block & block_with_constants, RPNElement & out) -> bool
{
return this->atomFromAST(node, context, block_with_constants, out);
return this->atomFromAST(node, atom_context, block_with_constants, out);
}).extractRPN(rpn);
}

1
dbms/src/Storages/MergeTree/RPNBuilder.cpp
View File

@ -1 +0,0 @@
#include <Storages/MergeTree/RPNBuilder.h>

8
dbms/src/Storages/MergeTree/RPNBuilder.h
View File

@ -18,12 +18,12 @@ namespace DB
* For index to work when something like "WHERE Date = toDate(now())" is written.
*/
static Block getBlockWithConstants(
const ASTPtr & query, const SyntaxAnalyzerResultPtr & syntax_analyzer_result, const Context & context)
const ASTPtr & query, const SyntaxAnalyzerResultPtr & syntax_analyzer_result, const Context & context)
{
Block result
{
{ DataTypeUInt8().createColumnConstWithDefaultValue(1), std::make_shared<DataTypeUInt8>(), "_dummy" }
};
{
{ DataTypeUInt8().createColumnConstWithDefaultValue(1), std::make_shared<DataTypeUInt8>(), "_dummy" }
};
const auto expr_for_constant_folding = ExpressionAnalyzer(query, syntax_analyzer_result, context).getConstActions();