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

Let's make it fancier (function try catch block).

Browse Source
This commit is contained in:
Amos Bird 2018-05-25 23:38:57 +08:00
parent 13762471da
commit 9eec14e9be
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dbms/src/Interpreters/InterserverIOHandler.h
View File

@ -85,25 +85,27 @@ public:
void addEndpoint(const String & name, InterserverIOEndpointPtr endpoint) void addEndpoint(const String & name, InterserverIOEndpointPtr endpoint)
{ {
std::lock_guard<std::mutex> lock(mutex); std::lock_guard<std::mutex> lock(mutex);
if (endpoint_map.count(name)) bool inserted = endpoint_map.try_emplace(name, std::move(endpoint)).second;
if (!inserted)
throw Exception("Duplicate interserver IO endpoint: " + name, ErrorCodes::DUPLICATE_INTERSERVER_IO_ENDPOINT); throw Exception("Duplicate interserver IO endpoint: " + name, ErrorCodes::DUPLICATE_INTERSERVER_IO_ENDPOINT);
endpoint_map[name] = std::move(endpoint);
} }
void removeEndpoint(const String & name) void removeEndpoint(const String & name)
{ {
std::lock_guard<std::mutex> lock(mutex); std::lock_guard<std::mutex> lock(mutex);
if (!endpoint_map.count(name)) if (!endpoint_map.erase(name))
throw Exception("No interserver IO endpoint named " + name, ErrorCodes::NO_SUCH_INTERSERVER_IO_ENDPOINT); throw Exception("No interserver IO endpoint named " + name, ErrorCodes::NO_SUCH_INTERSERVER_IO_ENDPOINT);
endpoint_map.erase(name);
} }
InterserverIOEndpointPtr getEndpoint(const String & name) InterserverIOEndpointPtr getEndpoint(const String & name)
try
{ {
std::lock_guard<std::mutex> lock(mutex); std::lock_guard<std::mutex> lock(mutex);
if (!endpoint_map.count(name)) return endpoint_map.at(name);
throw Exception("No interserver IO endpoint named " + name, ErrorCodes::NO_SUCH_INTERSERVER_IO_ENDPOINT); }
return endpoint_map[name]; catch (...)
{
throw Exception("No interserver IO endpoint named " + name, ErrorCodes::NO_SUCH_INTERSERVER_IO_ENDPOINT);
} }
private: private:
@ -129,17 +131,15 @@ public:
} }
~InterserverIOEndpointHolder() ~InterserverIOEndpointHolder()
try
{ {
try handler.removeEndpoint(name);
{ /// After destroying the object, `endpoint` can still live, since its ownership is acquired during the processing of the request,
handler.removeEndpoint(name); /// see InterserverIOHTTPHandler.cpp
/// After destroying the object, `endpoint` can still live, since its ownership is acquired during the processing of the request, }
/// see InterserverIOHTTPHandler.cpp catch (...)
} {
catch (...) tryLogCurrentException("~InterserverIOEndpointHolder");
{
tryLogCurrentException("~InterserverIOEndpointHolder");
}
} }
ActionBlocker & getBlocker() { return endpoint->blocker; } ActionBlocker & getBlocker() { return endpoint->blocker; }