From 39ec3f7d74fe21ee04b6da3402d1becd6298bc24 Mon Sep 17 00:00:00 2001 From: Nikolai Kochetov Date: Thu, 14 Dec 2017 20:04:42 +0300 Subject: [PATCH] changed exception message, added comments --- dbms/src/Common/ErrorCodes.cpp | 1 + dbms/src/Interpreters/ExternalLoader.cpp | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dbms/src/Common/ErrorCodes.cpp b/dbms/src/Common/ErrorCodes.cpp index c51e3bc5b4..b35fc3b3d5 100644 --- a/dbms/src/Common/ErrorCodes.cpp +++ b/dbms/src/Common/ErrorCodes.cpp @@ -364,6 +364,7 @@ namespace ErrorCodes extern const int PART_IS_TEMPORARILY_LOCKED = 384; extern const int MULTIPLE_STREAMS_REQUIRED = 385; extern const int NO_COMMON_TYPE = 386; + extern const int EXTERNAL_LOADABLE_ALREADY_EXISTS = 387; extern const int KEEPER_EXCEPTION = 999; extern const int POCO_EXCEPTION = 1000; diff --git a/dbms/src/Interpreters/ExternalLoader.cpp b/dbms/src/Interpreters/ExternalLoader.cpp index cf982ebbfc..f12f67c22e 100644 --- a/dbms/src/Interpreters/ExternalLoader.cpp +++ b/dbms/src/Interpreters/ExternalLoader.cpp @@ -14,6 +14,7 @@ namespace ErrorCodes { extern const int LOGICAL_ERROR; extern const int BAD_ARGUMENTS; +extern const int EXTERNAL_LOADABLE_ALREADY_EXISTS; } @@ -291,8 +292,11 @@ void ExternalLoader::reloadFromConfigFile(const std::string & config_path, const object_it = loadable_objects.find(name); } + /// Object with the same name was declared in other config file. if (object_it != std::end(loadable_objects) && object_it->second.origin != config_path) - throw std::runtime_error{"Overriding " + object_name + " from file " + object_it->second.origin}; + throw Exception(object_name + " '" + name + "' from file " + config_path + + " already declared in file " + object_it->second.origin, + ErrorCodes::EXTERNAL_LOADABLE_ALREADY_EXISTS); auto object_ptr = create(name, *config, key); -- GitLab