From 631a1a271769dc7a73ea0a05cefea9ba3a6935cb Mon Sep 17 00:00:00 2001 From: Alexey Arno Date: Mon, 12 Jan 2015 15:08:11 +0300 Subject: [PATCH] dbms: Server: add improvements and the ability of waiting for a read event on several connections. [#METR-14410] --- dbms/include/DB/Client/ConnectionPool.h | 2 +- dbms/include/DB/Client/ConnectionPoolWithFailover.h | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dbms/include/DB/Client/ConnectionPool.h b/dbms/include/DB/Client/ConnectionPool.h index aece5616f36..6e0acd1354c 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(unsigned max_connections, Settings * settings = nullptr) + virtual std::vector getMany(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 d468e10f5a9..04c7ed296f1 100644 --- a/dbms/include/DB/Client/ConnectionPoolWithFailover.h +++ b/dbms/include/DB/Client/ConnectionPoolWithFailover.h @@ -57,11 +57,13 @@ public: return Base::get(settings); } - /** Выделяет до указанного количества соединений. */ - std::vector getMany(unsigned max_connections, Settings * settings = nullptr) override + /** Выделяет до указанного количества соединений для работы. + * Соединения предоставляют доступ к разным репликам одного шарда. + */ + std::vector getMany(Settings * settings = nullptr) override { applyLoadBalancing(settings); - return Base::getMany(max_connections, settings); + return Base::getMany(settings); } protected: