thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 07:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Miscellaneous [#CLICKHOUSE-2].

Browse Source
This commit is contained in:
Alexey Milovidov 2017-07-27 23:40:32 +03:00
parent c477c7e1cb
commit d08f06ee85
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/libmysqlxx/include/mysqlxx/PoolWithFailover.h
View File

@ -70,12 +70,11 @@ namespace mysqlxx
struct Replica
{
PoolPtr pool;
int priority;
int error_count;
int priority = 0;
Replica() : priority(0), error_count(0) {}
Replica() {}
Replica(PoolPtr pool_, int priority_)
: pool(pool_), priority(priority_), error_count(0) {}
: pool(pool_), priority(priority_) {}
};
using Replicas = std::vector<Replica>;

21
libs/libmysqlxx/src/PoolWithFailover.cpp
View File

@ -18,15 +18,20 @@ PoolWithFailover::PoolWithFailover(const Poco::Util::AbstractConfiguration & cfg
if (replica_config_key == "replica") /// There could be another elements in the same level in configuration file.
{
std::string replica_name = config_name + "." + replica_config_key;
Replica replica(std::make_shared<Pool>(cfg, replica_name, default_connections, max_connections, config_name.c_str()),
cfg.getInt(replica_name + ".priority", 0));
replicas_by_priority[replica.priority].push_back(replica);
int priority = cfg.getInt(replica_name + ".priority", 0);
replicas_by_priority[priority].emplace_back(
std::make_shared<Pool>(cfg, replica_name, default_connections, max_connections, config_name.c_str()),
priority);
}
}
}
else
{
replicas_by_priority[0].push_back(Replica(std::make_shared<Pool>(cfg, config_name, default_connections, max_connections), 0));
replicas_by_priority[0].emplace_back(
std::make_shared<Pool>(cfg, config_name, default_connections, max_connections),
0);
}
}
@ -62,10 +67,10 @@ PoolWithFailover::Entry PoolWithFailover::Get()
{
full_pool = nullptr;
for (ReplicasByPriority::iterator it = replicas_by_priority.begin(); it != replicas_by_priority.end(); ++it)
for (auto & priority_replicas : replicas_by_priority)
{
Replicas & replicas = it->second;
for (size_t i = 0; i < replicas.size(); ++i)
Replicas & replicas = priority_replicas.second;
for (size_t i = 0, size = replicas.size(); i < size; ++i)
{
Replica & replica = replicas[i];
@ -84,7 +89,7 @@ PoolWithFailover::Entry PoolWithFailover::Get()
}
catch (const Poco::Exception & e)
{
if (e.displayText() == "mysqlxx::Pool is full")
if (e.displayText() == "mysqlxx::Pool is full") /// NOTE: String comparison is trashy code.
{
full_pool = &replica;
}