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

fixed bug with double column

Browse Source
This commit is contained in:
Nikita Vasilev 2019-01-29 16:13:18 +03:00
parent 7c036e9b43
commit 149b0d84f9
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
dbms/src/Storages/MergeTree/MergeTreeUniqueIndex.cpp
View File

@ -198,7 +198,12 @@ UniqueCondition::UniqueCondition(
if (!alwaysNotFalse)
return*/
actions = ExpressionAnalyzer(expression_ast, query.syntax_analyzer_result, context).getActions(true);
auto syntax_analyzer_result = SyntaxAnalyzer(context, {}).analyze(
expression_ast, index.header.getNamesAndTypesList());
actions = ExpressionAnalyzer(expression_ast, syntax_analyzer_result, context).getActions(true);
Poco::Logger * log = &Poco::Logger::get("unique_idx");
LOG_DEBUG(log, "new unique index" << actions->dumpActions());
}
bool UniqueCondition::alwaysUnknownOrTrue() const
@ -229,39 +234,41 @@ bool UniqueCondition::mayBeTrueOnGranule(MergeTreeIndexGranulePtr idx_granule) c
return false;
}
void UniqueCondition::traverseAST(ASTPtr & node, bool replace_all) const
void UniqueCondition::traverseAST(ASTPtr & node) const
{
if (operatorFromAST(node)) {
ASTFunction * func = typeid_cast<ASTFunction *>(&*node);
auto & args = typeid_cast<ASTExpressionList &>(*func->arguments).children;
for (size_t i = 0, size = args.size(); i < size; ++i)
traverseAST(args[i], replace_all);
traverseAST(args[i]);
return;
}
if (!atomFromAST(node, replace_all))
*node = ASTLiteral(Field(3)); /// Unknown
if (!atomFromAST(node))
node = std::make_shared<ASTLiteral>(Field(3)); /// can_be_true=1 can_be_false=0
}
bool UniqueCondition::termFromAST(const ASTPtr & node, bool replace_all) const
bool UniqueCondition::termFromAST(ASTPtr & node) const
{
/// Function, literal or column
if (typeid_cast<const ASTLiteral *>(node.get()))
return true;
if (replace_all)
return false;
if (const ASTIdentifier * identifier = typeid_cast<const ASTIdentifier *>(node.get()))
return key_columns.count(identifier->getColumnName()) != 0;
if (const ASTFunction * func = typeid_cast<const ASTFunction *>(node.get())) {
if (ASTFunction * func = typeid_cast<ASTFunction *>(node.get()))
{
if (key_columns.count(func->getColumnName()))
{
/// Function is already calculated.
node = std::make_shared<ASTIdentifier>(func->getColumnName());
return true;
}
const ASTs & args = typeid_cast<const ASTExpressionList &>(*func->arguments).children;
ASTs & args = typeid_cast<ASTExpressionList &>(*func->arguments).children;
for (size_t i = 0, size = args.size(); i < size; ++i)
if (!termFromAST(args[i]))
@ -273,21 +280,18 @@ bool UniqueCondition::termFromAST(const ASTPtr & node, bool replace_all) const
return false;
}
bool UniqueCondition::atomFromAST(const ASTPtr & node, bool replace_all) const
bool UniqueCondition::atomFromAST(ASTPtr & node) const
{
/// Functions < > = != <= >= in `notIn`
if (termFromAST(node, replace_all))
if (termFromAST(node))
return true;
if (replace_all)
return false;
if (const ASTFunction * func = typeid_cast<const ASTFunction *>(node.get()))
if (ASTFunction * func = typeid_cast<ASTFunction *>(node.get()))
{
const ASTs & args = typeid_cast<const ASTExpressionList &>(*func->arguments).children;
ASTs & args = typeid_cast<ASTExpressionList &>(*func->arguments).children;
for (size_t i = 0, size = args.size(); i < size; ++i)
if (!termFromAST(args[i], replace_all))
if (!termFromAST(args[i]))
return false;
return true;

6
dbms/src/Storages/MergeTree/MergeTreeUniqueIndex.h
View File

@ -48,9 +48,9 @@ public:
~UniqueCondition() override = default;
private:
void traverseAST(ASTPtr & node, bool replace_all = false) const;
bool atomFromAST(const ASTPtr & node, bool replace_all = false) const;
bool termFromAST(const ASTPtr & node, bool replace_all = false) const;
void traverseAST(ASTPtr & node) const;
bool atomFromAST(ASTPtr & node) const;
bool termFromAST(ASTPtr & node) const;
bool operatorFromAST(ASTPtr & node) const;
const MergeTreeUniqueIndex & index;