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

fix

Browse Source
This commit is contained in:
Nikita Vasilev 2021-05-07 13:49:05 +03:00
parent 3225c7186c
commit cdf78828da
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Interpreters/ComparisonGraph.cpp
View File

@ -36,6 +36,8 @@ ASTPtr ComparisonGraph::normalizeAtom(const ASTPtr & atom)
ComparisonGraph::ComparisonGraph(const std::vector<ASTPtr> & atomic_formulas)
{
if (atomic_formulas.empty())
return;
static const std::unordered_map<std::string, Edge::Type> relation_to_enum =
{
{"equals", Edge::Type::EQUAL},

12
src/Interpreters/TreeCNFConverter.cpp
View File

@ -8,6 +8,7 @@ namespace DB
namespace ErrorCodes
{
extern const int LOGICAL_ERROR;
extern const int INCORRECT_QUERY;
}
/// Splits AND(a, b, c) to AND(a, AND(b, c)) for AND/OR
@ -17,6 +18,9 @@ void splitMultiLogic(ASTPtr & node)
if (func && (func->name == "and" || func->name == "or"))
{
if (func->arguments->children.size() < 2)
throw Exception("Bad logical function", ErrorCodes::INCORRECT_QUERY);
if (func->arguments->children.size() > 2)
{
ASTPtr res = func->arguments->children.front()->clone();
@ -58,7 +62,7 @@ void traversePushNot(ASTPtr & node, bool add_negation)
else if (func && func->name == "not")
{
if (func->arguments->children.size() != 1)
throw Exception("Bad NOT function.", ErrorCodes::LOGICAL_ERROR);
throw Exception("Bad NOT function.", ErrorCodes::INCORRECT_QUERY);
/// delete NOT
node = func->arguments->children[0]->clone();
@ -98,7 +102,7 @@ void pushOr(ASTPtr & query)
auto * or_func = or_node.get()->as<ASTFunction>();
if (or_func->arguments->children.size() != 2)
throw Exception("Bad OR function.", ErrorCodes::LOGICAL_ERROR);
throw Exception("Bad OR function", ErrorCodes::LOGICAL_ERROR);
/// find or upper than and
size_t and_node_id = or_func->arguments->children.size();
@ -117,7 +121,7 @@ void pushOr(ASTPtr & query)
const auto * and_func = or_func->arguments->children[and_node_id]->as<ASTFunction>();
if (and_func->arguments->children.size() != 2)
throw Exception("Bad AND function.", ErrorCodes::LOGICAL_ERROR);
throw Exception("Bad AND function", ErrorCodes::LOGICAL_ERROR);
auto a = or_func->arguments->children[other_node_id];
auto b = and_func->arguments->children[0];
@ -159,6 +163,8 @@ void traverseCNF(const ASTPtr & node, CNFQuery::AndGroup & and_group, CNFQuery::
}
else if (func && func->name == "not")
{
if (func->arguments->children.size() != 1)
throw Exception("Bad NOT function", ErrorCodes::INCORRECT_QUERY);
or_group.insert(CNFQuery::AtomicFormula{true, func->arguments->children.front()});
}
else

7
src/Storages/ConstraintsDescription.cpp
View File

@ -204,6 +204,13 @@ ConstraintsDescription & ConstraintsDescription::operator=(const ConstraintsDesc
void ConstraintsDescription::update()
{
if (constraints.empty())
{
cnf_constraints.clear();
ast_to_atom_ids.clear();
graph = std::make_unique<ComparisonGraph>(std::vector<ASTPtr>());
return;
}
cnf_constraints = buildConstraintData();
ast_to_atom_ids.clear();
for (size_t i = 0; i < cnf_constraints.size(); ++i)

2
src/Storages/MergeTree/SubstituteColumnOptimizer.cpp
View File

@ -244,7 +244,7 @@ void SubstituteColumnOptimizer::perform()
return;
}
const auto compare_graph = metadata_snapshot->getConstraints().getGraph();
const auto & compare_graph = metadata_snapshot->getConstraints().getGraph();
// Fill aliases
if (select_query->select())