From b5f51e0ca6b5e0dc6f95142dccc83a3564db4f8f Mon Sep 17 00:00:00 2001 From: Maksim Kita Date: Mon, 8 Mar 2021 02:02:50 +0300 Subject: [PATCH] Fixed style check --- src/Dictionaries/DirectDictionary.cpp | 2 +- src/Dictionaries/DirectDictionary.h | 8 +++++++- src/Dictionaries/ya.make | 1 - .../0_stateless/01754_direct_dictionary_complex_key.sql | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Dictionaries/DirectDictionary.cpp b/src/Dictionaries/DirectDictionary.cpp index f6a8907b29c..c937d337350 100644 --- a/src/Dictionaries/DirectDictionary.cpp +++ b/src/Dictionaries/DirectDictionary.cpp @@ -13,8 +13,8 @@ namespace DB namespace ErrorCodes { extern const int TYPE_MISMATCH; - extern const int BAD_ARGUMENTS; extern const int UNSUPPORTED_METHOD; + extern const int BAD_ARGUMENTS; } namespace diff --git a/src/Dictionaries/DirectDictionary.h b/src/Dictionaries/DirectDictionary.h index 4fa054625e0..685fd707ded 100644 --- a/src/Dictionaries/DirectDictionary.h +++ b/src/Dictionaries/DirectDictionary.h @@ -18,6 +18,11 @@ namespace DB { +namespace ErrorCodes +{ + extern const int BAD_ARGUMENTS; +} + template class DirectDictionary final : public IDictionary { @@ -31,7 +36,8 @@ public: DictionarySourcePtr source_ptr_, BlockPtr saved_block_ = nullptr); - std::string getTypeName() const override { + std::string getTypeName() const override + { if constexpr (dictionary_key_type == DictionaryKeyType::simple) return "Direct"; else diff --git a/src/Dictionaries/ya.make b/src/Dictionaries/ya.make index 97e91a8c213..4df58211118 100644 --- a/src/Dictionaries/ya.make +++ b/src/Dictionaries/ya.make @@ -26,7 +26,6 @@ SRCS( CassandraDictionarySource.cpp CassandraHelpers.cpp ClickHouseDictionarySource.cpp - ComplexKeyDirectDictionary.cpp ComplexKeyHashedDictionary.cpp DictionaryBlockInputStreamBase.cpp DictionaryFactory.cpp diff --git a/tests/queries/0_stateless/01754_direct_dictionary_complex_key.sql b/tests/queries/0_stateless/01754_direct_dictionary_complex_key.sql index 4dff35aa221..51b29457011 100644 --- a/tests/queries/0_stateless/01754_direct_dictionary_complex_key.sql +++ b/tests/queries/0_stateless/01754_direct_dictionary_complex_key.sql @@ -92,4 +92,4 @@ SELECT * FROM 01754_dictionary_db.direct_dictionary_complex_key_complex_attribut DROP DICTIONARY 01754_dictionary_db.direct_dictionary_complex_key_complex_attributes; DROP TABLE 01754_dictionary_db.complex_key_complex_attributes_source_table; -DROP DATABASE 01754_dictionary_db; \ No newline at end of file +DROP DATABASE 01754_dictionary_db;