thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-29 21:20:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
kssenii 2021-03-19 16:07:53 +00:00
parent a0f717619c
commit f374a71165
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Storages/PostgreSQL/PostgreSQLConnection.h
View File

@ -49,18 +49,17 @@ class PostgreSQLConnectionHolder
{ {
using Pool = ConcurrentBoundedQueue<PostgreSQLConnectionPtr>; using Pool = ConcurrentBoundedQueue<PostgreSQLConnectionPtr>;
using PoolPtr = std::shared_ptr<Pool>;
public: public:
PostgreSQLConnectionHolder(PostgreSQLConnectionPtr connection_, PoolPtr pool_) PostgreSQLConnectionHolder(PostgreSQLConnectionPtr connection_, Pool & pool_)
: connection(std::move(connection_)) : connection(std::move(connection_))
, pool(std::move(pool_)) , pool(pool_)
{ {
} }
PostgreSQLConnectionHolder(const PostgreSQLConnectionHolder & other) = delete; PostgreSQLConnectionHolder(const PostgreSQLConnectionHolder & other) = delete;
~PostgreSQLConnectionHolder() { pool->tryPush(connection); } ~PostgreSQLConnectionHolder() { pool.tryPush(connection); }
pqxx::connection & conn() const { return *connection->get(); } pqxx::connection & conn() const { return *connection->get(); }
@ -68,7 +67,7 @@ public:
private: private:
PostgreSQLConnectionPtr connection; PostgreSQLConnectionPtr connection;
PoolPtr pool; Pool & pool;
}; };
using PostgreSQLConnectionHolderPtr = std::shared_ptr<PostgreSQLConnectionHolder>; using PostgreSQLConnectionHolderPtr = std::shared_ptr<PostgreSQLConnectionHolder>;

4
src/Storages/PostgreSQL/PostgreSQLConnectionPool.cpp
View File

@ -48,11 +48,11 @@ PostgreSQLConnectionHolderPtr PostgreSQLConnectionPool::get()
PostgreSQLConnectionPtr connection; PostgreSQLConnectionPtr connection;
if (pool->tryPop(connection, POSTGRESQL_POOL_WAIT_MS)) if (pool->tryPop(connection, POSTGRESQL_POOL_WAIT_MS))
{ {
return std::make_shared<PostgreSQLConnectionHolder>(connection, pool); return std::make_shared<PostgreSQLConnectionHolder>(connection, *pool);
} }
connection = std::make_shared<PostgreSQLConnection>(connection_str, address); connection = std::make_shared<PostgreSQLConnection>(connection_str, address);
return std::make_shared<PostgreSQLConnectionHolder>(connection, pool); return std::make_shared<PostgreSQLConnectionHolder>(connection, *pool);
} }