Skip to content

Commit 1418ebf

Browse files
CheSemazvonand
authored andcommitted
Merge pull request ClickHouse#89090 from ClickHouse/mstetsyuk-patch-1
remove try/catch from `~PooledConnection`
1 parent c74e56b commit 1418ebf

File tree

1 file changed

+26
-33
lines changed

1 file changed

+26
-33
lines changed

src/Common/HTTPConnectionPool.cpp

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -434,45 +434,38 @@ class EndpointConnectionPool : public std::enable_shared_from_this<EndpointConne
434434

435435
~PooledConnection() override
436436
{
437-
try
437+
if (bool(response_stream))
438438
{
439-
if (bool(response_stream))
439+
if (auto * fixed_steam = dynamic_cast<Poco::Net::HTTPFixedLengthInputStream *>(response_stream))
440440
{
441-
if (auto * fixed_steam = dynamic_cast<Poco::Net::HTTPFixedLengthInputStream *>(response_stream))
442-
{
443-
response_stream_completed = fixed_steam->isComplete();
444-
}
445-
else if (auto * chunked_steam = dynamic_cast<Poco::Net::HTTPChunkedInputStream *>(response_stream))
446-
{
447-
response_stream_completed = chunked_steam->isComplete();
448-
}
449-
else if (auto * http_stream = dynamic_cast<Poco::Net::HTTPInputStream *>(response_stream))
450-
{
451-
response_stream_completed = http_stream->isComplete();
452-
}
453-
else
454-
{
455-
response_stream_completed = false;
456-
}
441+
response_stream_completed = fixed_steam->isComplete();
457442
}
458-
response_stream = nullptr;
459-
Session::setSendDataHooks();
460-
Session::setReceiveDataHooks();
461-
Session::setSendThrottler();
462-
Session::setReceiveThrottler();
443+
else if (auto * chunked_steam = dynamic_cast<Poco::Net::HTTPChunkedInputStream *>(response_stream))
444+
{
445+
response_stream_completed = chunked_steam->isComplete();
446+
}
447+
else if (auto * http_stream = dynamic_cast<Poco::Net::HTTPInputStream *>(response_stream))
448+
{
449+
response_stream_completed = http_stream->isComplete();
450+
}
451+
else
452+
{
453+
response_stream_completed = false;
454+
}
455+
}
456+
response_stream = nullptr;
457+
Session::setSendDataHooks();
458+
Session::setReceiveDataHooks();
459+
Session::setSendThrottler();
460+
Session::setReceiveThrottler();
463461

464-
group->atConnectionDestroy();
462+
group->atConnectionDestroy();
465463

466-
if (!isExpired)
467-
if (auto lock = pool.lock())
468-
lock->atConnectionDestroy(*this);
464+
if (!isExpired)
465+
if (auto lock = pool.lock())
466+
lock->atConnectionDestroy(*this);
469467

470-
CurrentMetrics::sub(metrics.active_count);
471-
}
472-
catch (...)
473-
{
474-
tryLogCurrentException(__PRETTY_FUNCTION__);
475-
}
468+
CurrentMetrics::sub(metrics.active_count);
476469
}
477470

478471
private:

0 commit comments

Comments
 (0)