thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbms: fixed error in primary key usage [#METR-11540].

Browse Source
This commit is contained in:
Alexey Milovidov 2014-06-11 22:38:10 +04:00
parent 80403594bc
commit 5a300300d2
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dbms/src/Storages/MergeTree/PKCondition.cpp
View File

@ -147,7 +147,7 @@ bool PKCondition::atomFromAST(ASTPtr & node, Block & block_with_constants, RPNEl
}
else
return false;
std::string func_name = func->name;
/// Заменим <const> <sign> <column> на <column> <-sign> <const>
@ -166,24 +166,24 @@ bool PKCondition::atomFromAST(ASTPtr & node, Block & block_with_constants, RPNEl
out.function = RPNElement::FUNCTION_IN_RANGE;
out.key_column = column;
if (func->name == "notEquals")
if (func_name == "notEquals")
{
out.function = RPNElement::FUNCTION_NOT_IN_RANGE;
out.range = Range(value);
}
else if (func->name == "equals")
else if (func_name == "equals")
out.range = Range(value);
else if (func->name == "less")
else if (func_name == "less")
out.range = Range::createRightBounded(value, false);
else if (func->name == "greater")
else if (func_name == "greater")
out.range = Range::createLeftBounded(value, false);
else if (func->name == "lessOrEquals")
else if (func_name == "lessOrEquals")
out.range = Range::createRightBounded(value, true);
else if (func->name == "greaterOrEquals")
else if (func_name == "greaterOrEquals")
out.range = Range::createLeftBounded(value, true);
else if (func->name == "in" || func->name == "notIn")
else if (func_name == "in" || func_name == "notIn")
{
out.function = func->name == "in" ? RPNElement::FUNCTION_IN_SET : RPNElement::FUNCTION_NOT_IN_SET;
out.function = func_name == "in" ? RPNElement::FUNCTION_IN_SET : RPNElement::FUNCTION_NOT_IN_SET;
out.in_function = node;
}
else