thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 16:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48662 from hanfei1991/hanfei/refine-expmsg1

Browse Source 
fix 02504_regexp_dictionary_table_source
This commit is contained in:
Alexander Tokmakov 2023-04-11 18:20:10 +03:00 committed by GitHub
commit 1982e2e040
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Dictionaries/RegExpTreeDictionary.cpp
View File

@ -271,14 +271,16 @@ void RegExpTreeDictionary::initGraph()
for (const auto & [id, value]: regex_nodes) for (const auto & [id, value]: regex_nodes)
if (value->parent_id == 0) // this is root node. if (value->parent_id == 0) // this is root node.
initTopologyOrder(id, visited, topology_id); initTopologyOrder(id, visited, topology_id);
/// If there is a cycle and all nodes have a parent, this condition will be met.
if (topology_order.size() != regex_nodes.size()) if (topology_order.size() != regex_nodes.size())
throw Exception(ErrorCodes::LOGICAL_ERROR, "The topology order cannot match the number of regex nodes. This is likely a internal bug."); throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "The regexp tree is cyclical. Please check your config.");
} }
void RegExpTreeDictionary::initTopologyOrder(UInt64 node_idx, std::set<UInt64> & visited, UInt64 & topology_id) void RegExpTreeDictionary::initTopologyOrder(UInt64 node_idx, std::set<UInt64> & visited, UInt64 & topology_id)
{ {
visited.insert(node_idx); visited.insert(node_idx);
for (UInt64 child_idx : regex_nodes[node_idx]->children) for (UInt64 child_idx : regex_nodes[node_idx]->children)
/// there is a cycle when dfs the graph.
if (visited.contains(child_idx)) if (visited.contains(child_idx))
throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "The regexp tree is cyclical. Please check your config."); throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "The regexp tree is cyclical. Please check your config.");
else else