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

dbms: ClickHouseDictionarySource: check that key is present before dereferencing [#METR-18945]

Browse Source
This commit is contained in:
Andrey Mironov 2015-11-19 09:50:05 +03:00
parent f67c8e63a2
commit 6d42868283
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dbms/include/DB/Dictionaries/ClickHouseDictionarySource.h
View File

@ -42,7 +42,7 @@ public:
"ClickHouseDictionarySource")
},
load_all_query{composeLoadAllQuery()},
key_tuple_definition{composeKeyTupleDefinition()}
key_tuple_definition{dict_struct.key ? composeKeyTupleDefinition() : std::string{}}
{}
/// copy-constructor is provided in order to support cloneability
@ -318,6 +318,9 @@ private:
std::string composeKeyTupleDefinition() const
{
if (!dict_struct.key)
throw Exception{"Composite key required for method", ErrorCodes::UNSUPPORTED_METHOD};
std::string result{"("};
auto first = true;