Fix infinite loop in dictIsIn function #515

src/Core/Defines.h

@@ -98,3 +98,6 @@
 
 /// Default limit on recursion depth of recursive descend parser.
 #define DBMS_DEFAULT_MAX_PARSER_DEPTH 1000
+
+/// Max depth of hierarchical dictionary
+#define DBMS_HIERARCHICAL_DICTIONARY_MAX_DEPTH 1000

src/Dictionaries/CacheDictionary.cpp

@@ -10,6 +10,7 @@
 #include <Common/ProfilingScopedRWLock.h>
 #include <Common/randomSeed.h>
 #include <Common/typeid_cast.h>
+#include <Core/Defines.h>
 #include <ext/range.h>
 #include <ext/size.h>
 #include <Common/setThreadName.h>
@@ -17,6 +18,7 @@
 #include "DictionaryBlockInputStream.h"
 #include "DictionaryFactory.h"
 
+
 namespace ProfileEvents
 {
 extern const Event DictCacheKeysRequested;
@@ -144,7 +146,7 @@ void CacheDictionary::isInImpl(const PaddedPODArray<Key> & child_ids, const Ance
     PaddedPODArray<Key> children(out_size, 0);
     PaddedPODArray<Key> parents(child_ids.begin(), child_ids.end());
 
-    while (true)
+    for (size_t i = 0; i < DBMS_HIERARCHICAL_DICTIONARY_MAX_DEPTH; ++i)
     {
         size_t out_idx = 0;
         size_t parents_idx = 0;
@@ -218,7 +220,7 @@ void CacheDictionary::isInConstantVector(const Key child_id, const PaddedPODArra
     std::vector<Key> ancestors(1, child_id);
 
     /// Iteratively find all ancestors for child.
-    while (true)
+    for (size_t i = 0; i < DBMS_HIERARCHICAL_DICTIONARY_MAX_DEPTH; ++i)
     {
         toParent(child, parent);
 

src/Dictionaries/FlatDictionary.cpp

@@ -2,6 +2,8 @@
 #include <IO/WriteHelpers.h>
 #include "DictionaryBlockInputStream.h"
 #include "DictionaryFactory.h"
+#include <Core/Defines.h>
+
 
 namespace DB
 {
@@ -77,7 +79,7 @@ void FlatDictionary::isInImpl(const ChildType & child_ids, const AncestorType &
         auto id = getAt(child_ids, row);
         const auto ancestor_id = getAt(ancestor_ids, row);
 
-        while (id < loaded_size && id != null_value && id != ancestor_id)
+        for (size_t i = 0; id < loaded_size && id != null_value && id != ancestor_id && i < DBMS_HIERARCHICAL_DICTIONARY_MAX_DEPTH; ++i)
             id = attr[id];
 
         out[row] = id != null_value && id == ancestor_id;

src/Dictionaries/HashedDictionary.cpp

@@ -2,6 +2,8 @@
 #include <ext/size.h>
 #include "DictionaryBlockInputStream.h"
 #include "DictionaryFactory.h"
+#include <Core/Defines.h>
+
 
 namespace
 {
@@ -87,7 +89,7 @@ void HashedDictionary::isInAttrImpl(const AttrType & attr, const ChildType & chi
         auto id = getAt(child_ids, row);
         const auto ancestor_id = getAt(ancestor_ids, row);
 
-        while (id != null_value && id != ancestor_id)
+        for (size_t i = 0; id != null_value && id != ancestor_id && i < DBMS_HIERARCHICAL_DICTIONARY_MAX_DEPTH; ++i)
         {
             auto it = attr.find(id);
             if (it != std::end(attr))

tests/queries/0_stateless/01251_dict_is_in_infinite_loop.reference

+1
+1
+1
+1
+1
+0
+0
+0
+0

tests/queries/0_stateless/01251_dict_is_in_infinite_loop.sql

+DROP TABLE IF EXISTS dict_source;
+CREATE TABLE dict_source (id UInt64, parent_id UInt64, value String) ENGINE = Memory;
+INSERT INTO dict_source VALUES (1, 0, 'hello'), (2, 1, 'world'), (3, 2, 'upyachka'), (11, 22, 'a'), (22, 11, 'b');
+
+DROP DATABASE IF EXISTS database_for_dict;
+CREATE DATABASE database_for_dict Engine = Ordinary;
+
+DROP DICTIONARY IF EXISTS database_for_dict.dictionary_with_hierarchy;
+
+CREATE DICTIONARY database_for_dict.dictionary_with_hierarchy
+(
+    id UInt64, parent_id UInt64 HIERARCHICAL, value String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(host 'localhost' port 9000 user 'default' table 'dict_source'))
+LAYOUT(HASHED())
+LIFETIME(MIN 1 MAX 1);
+
+SELECT dictIsIn('database_for_dict.dictionary_with_hierarchy', toUInt64(2), toUInt64(1));
+
+SELECT dictIsIn('database_for_dict.dictionary_with_hierarchy', toUInt64(22), toUInt64(11));
+SELECT dictIsIn('database_for_dict.dictionary_with_hierarchy', materialize(toUInt64(22)), toUInt64(11));
+SELECT dictIsIn('database_for_dict.dictionary_with_hierarchy', toUInt64(11), materialize(toUInt64(22)));
+SELECT dictIsIn('database_for_dict.dictionary_with_hierarchy', materialize(toUInt64(22)), materialize(toUInt64(11)));
+
+SELECT dictIsIn('database_for_dict.dictionary_with_hierarchy', toUInt64(22), toUInt64(111));
+SELECT dictIsIn('database_for_dict.dictionary_with_hierarchy', materialize(toUInt64(22)), toUInt64(111));
+SELECT dictIsIn('database_for_dict.dictionary_with_hierarchy', toUInt64(11), materialize(toUInt64(222)));
+SELECT dictIsIn('database_for_dict.dictionary_with_hierarchy', materialize(toUInt64(22)), materialize(toUInt64(111)));
+
+DROP DICTIONARY database_for_dict.dictionary_with_hierarchy;
+DROP TABLE dict_source;
+DROP DATABASE database_for_dict;