thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-24 10:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Miscellaneous [#CLICKHOUSE-3559]

Browse Source
This commit is contained in:
Alexey Milovidov 2018-02-05 20:56:50 +03:00
parent 71ea3774a3
commit 1ec60b69e2
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dbms/src/DataTypes/DataTypeEnum.cpp
View File

@ -68,17 +68,17 @@ void DataTypeEnum<Type>::fillMaps()
{ {
const auto name_to_value_pair = name_to_value_map.insert( const auto name_to_value_pair = name_to_value_map.insert(
{ StringRef{name_and_value.first}, name_and_value.second }); { StringRef{name_and_value.first}, name_and_value.second });
if (!name_to_value_pair.second) if (!name_to_value_pair.second)
throw Exception{ throw Exception{"Duplicate names in enum: '" + name_and_value.first + "' = " + toString(name_and_value.second)
"Duplicate names in enum: '" + name_and_value.first + "' = " + toString(name_and_value.second)
+ " and '" + name_to_value_pair.first->first.toString() + "' = " + toString(name_to_value_pair.first->second), + " and '" + name_to_value_pair.first->first.toString() + "' = " + toString(name_to_value_pair.first->second),
ErrorCodes::SYNTAX_ERROR}; ErrorCodes::SYNTAX_ERROR};
const auto value_to_name_pair = value_to_name_map.insert( const auto value_to_name_pair = value_to_name_map.insert(
{ name_and_value.second, StringRef{name_and_value.first} }); { name_and_value.second, StringRef{name_and_value.first} });
if (!value_to_name_pair.second) if (!value_to_name_pair.second)
throw Exception{ throw Exception{"Duplicate values in enum: '" + name_and_value.first + "' = " + toString(name_and_value.second)
"Duplicate values in enum: '" + name_and_value.first + "' = " + toString(name_and_value.second)
+ " and '" + value_to_name_pair.first->second.toString() + "' = " + toString(value_to_name_pair.first->first), + " and '" + value_to_name_pair.first->second.toString() + "' = " + toString(value_to_name_pair.first->first),
ErrorCodes::SYNTAX_ERROR}; ErrorCodes::SYNTAX_ERROR};
} }
@ -88,9 +88,7 @@ template <typename Type>
DataTypeEnum<Type>::DataTypeEnum(const Values & values_) : values{values_} DataTypeEnum<Type>::DataTypeEnum(const Values & values_) : values{values_}
{ {
if (values.empty()) if (values.empty())
throw Exception{ throw Exception{"DataTypeEnum enumeration cannot be empty", ErrorCodes::EMPTY_DATA_PASSED};
"DataTypeEnum enumeration cannot be empty",
ErrorCodes::EMPTY_DATA_PASSED};
fillMaps(); fillMaps();