From 953e318ea237a3db6210aecf16f0628d4138dd63 Mon Sep 17 00:00:00 2001 From: Alexey Arno Date: Tue, 30 Dec 2014 17:11:02 +0300 Subject: [PATCH] dbms: Server: add support for multiple connections in PoolWithFailoverBase. [#METR-14410] --- dbms/include/DB/Client/ConnectionPool.h | 2 +- dbms/include/DB/Client/ConnectionPoolWithFailover.h | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dbms/include/DB/Client/ConnectionPool.h b/dbms/include/DB/Client/ConnectionPool.h index 6e0acd1354c..aece5616f36 100644 --- a/dbms/include/DB/Client/ConnectionPool.h +++ b/dbms/include/DB/Client/ConnectionPool.h @@ -28,7 +28,7 @@ public: typedef PoolBase::Entry Entry; virtual Entry get(Settings * settings = nullptr) = 0; - virtual std::vector getMany(Settings * settings = nullptr) + virtual std::vector getMany(unsigned max_connections, Settings * settings = nullptr) { return std::vector{ get(settings) }; } diff --git a/dbms/include/DB/Client/ConnectionPoolWithFailover.h b/dbms/include/DB/Client/ConnectionPoolWithFailover.h index 04c7ed296f1..d468e10f5a9 100644 --- a/dbms/include/DB/Client/ConnectionPoolWithFailover.h +++ b/dbms/include/DB/Client/ConnectionPoolWithFailover.h @@ -57,13 +57,11 @@ public: return Base::get(settings); } - /** Выделяет до указанного количества соединений для работы. - * Соединения предоставляют доступ к разным репликам одного шарда. - */ - std::vector getMany(Settings * settings = nullptr) override + /** Выделяет до указанного количества соединений. */ + std::vector getMany(unsigned max_connections, Settings * settings = nullptr) override { applyLoadBalancing(settings); - return Base::getMany(settings); + return Base::getMany(max_connections, settings); } protected: