From 7798c45b5b77951f815eea3de256ab8ee0c25079 Mon Sep 17 00:00:00 2001 From: Andrey Mironov Date: Mon, 16 Nov 2015 16:20:10 +0300 Subject: [PATCH] dbms: rename validateKeyColumns to validateKeyTypes [#METR-17328] --- .../DB/Dictionaries/ComplexKeyHashedDictionary.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dbms/include/DB/Dictionaries/ComplexKeyHashedDictionary.h b/dbms/include/DB/Dictionaries/ComplexKeyHashedDictionary.h index 02fdf313709..65fd2a3b687 100644 --- a/dbms/include/DB/Dictionaries/ComplexKeyHashedDictionary.h +++ b/dbms/include/DB/Dictionaries/ComplexKeyHashedDictionary.h @@ -86,7 +86,7 @@ public: const std::string & attribute_name, const ConstColumnPlainPtrs & key_columns, const DataTypes & key_types,\ PODArray & out) const\ {\ - validateKeyColumns(key_types);\ + validateKeyTypes(key_types);\ \ const auto & attribute = getAttribute(attribute_name);\ if (attribute.type != AttributeUnderlyingType::TYPE)\ @@ -116,7 +116,7 @@ public: const std::string & attribute_name, const ConstColumnPlainPtrs & key_columns, const DataTypes & key_types, ColumnString * out) const { - validateKeyColumns(key_types); + validateKeyTypes(key_types); const auto & attribute = getAttribute(attribute_name); if (attribute.type != AttributeUnderlyingType::String) @@ -137,7 +137,7 @@ public: const std::string & attribute_name, const ConstColumnPlainPtrs & key_columns, const DataTypes & key_types,\ const PODArray & def, PODArray & out) const\ {\ - validateKeyColumns(key_types);\ + validateKeyTypes(key_types);\ \ const auto & attribute = getAttribute(attribute_name);\ if (attribute.type != AttributeUnderlyingType::TYPE)\ @@ -165,7 +165,7 @@ public: const std::string & attribute_name, const ConstColumnPlainPtrs & key_columns, const DataTypes & key_types, const ColumnString * const def, ColumnString * const out) const { - validateKeyColumns(key_types); + validateKeyTypes(key_types); const auto & attribute = getAttribute(attribute_name); if (attribute.type != AttributeUnderlyingType::String) @@ -371,7 +371,7 @@ private: return out.str(); } - void validateKeyColumns(const DataTypes & key_types) const + void validateKeyTypes(const DataTypes & key_types) const { if (key_types.size() != dict_struct.key->size()) throw Exception{