mirror of
https://github.com/rbock/sqlpp11.git
synced 2024-11-15 20:31:16 +08:00
Remove incomplete connection pool
Porting the connection pool from sqlpp17 seems more promising, see #397
This commit is contained in:
Roland Bock
parent
7d74b1d1a6
commit
40845e6b09
@ -1,211 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2013 - 2017, Roland Bock, Frank Park
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without modification,
|
|
||||||
* are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
*
|
|
||||||
* Redistributions in binary form must reproduce the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer in the documentation and/or
|
|
||||||
* other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
|
||||||
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef SQLPP_CONNECTION_POOL_H
|
|
||||||
#define SQLPP_CONNECTION_POOL_H
|
|
||||||
|
|
||||||
#include <mutex>
|
|
||||||
#include <stack>
|
|
||||||
#include <unordered_map>
|
|
||||||
#include <memory>
|
|
||||||
#include <iostream>
|
|
||||||
#include <chrono>
|
|
||||||
#include <type_traits>
|
|
||||||
#include <sqlpp11/exception.h>
|
|
||||||
#include <sqlpp11/pool_connection.h>
|
|
||||||
|
|
||||||
namespace sqlpp
|
|
||||||
{
|
|
||||||
namespace reconnect_policy
|
|
||||||
{
|
|
||||||
struct auto_reconnect
|
|
||||||
{
|
|
||||||
template <typename Connection>
|
|
||||||
void operator()(Connection* connection)
|
|
||||||
{
|
|
||||||
if (!connection->is_valid())
|
|
||||||
connection->reconnect();
|
|
||||||
}
|
|
||||||
template <typename Connection>
|
|
||||||
void clean(Connection* connection)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
class periodic_reconnect
|
|
||||||
{
|
|
||||||
private:
|
|
||||||
std::chrono::seconds revalidate_after;
|
|
||||||
std::unordered_map<void*, std::chrono::time_point<std::chrono::system_clock>> last_checked;
|
|
||||||
|
|
||||||
public:
|
|
||||||
periodic_reconnect(const std::chrono::seconds r = std::chrono::seconds(28800)) // default wait_timeout in MySQL
|
|
||||||
: revalidate_after(r), last_checked()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename Connection>
|
|
||||||
void operator()(Connection* con)
|
|
||||||
{
|
|
||||||
auto last = last_checked.find(con);
|
|
||||||
auto now = std::chrono::system_clock::now();
|
|
||||||
if (last == last_checked.end())
|
|
||||||
{
|
|
||||||
if (!con->is_valid())
|
|
||||||
{
|
|
||||||
con->reconnect();
|
|
||||||
}
|
|
||||||
last_checked.emplace_hint(last, con, now);
|
|
||||||
}
|
|
||||||
else if (now - last->second > revalidate_after)
|
|
||||||
{
|
|
||||||
if (!con->is_valid())
|
|
||||||
{
|
|
||||||
con->reconnect();
|
|
||||||
}
|
|
||||||
last = now;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
template <typename Connection>
|
|
||||||
void clean(Connection* con)
|
|
||||||
{
|
|
||||||
auto itr = last_checked.find(con);
|
|
||||||
if (itr != last_checked.end())
|
|
||||||
{
|
|
||||||
last_checked.erase(itr);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
struct never_reconnect
|
|
||||||
{
|
|
||||||
template <typename Connection>
|
|
||||||
void operator()(Connection*)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
template <typename Connection>
|
|
||||||
void clean(Connection*)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename Connection_config,
|
|
||||||
typename Reconnect_policy = reconnect_policy::auto_reconnect,
|
|
||||||
typename Connection = typename std::enable_if<std::is_class<typename Connection_config::connection>::value,
|
|
||||||
typename Connection_config::connection>::type>
|
|
||||||
class connection_pool
|
|
||||||
{
|
|
||||||
friend pool_connection<Connection_config, Reconnect_policy, Connection>;
|
|
||||||
|
|
||||||
private:
|
|
||||||
std::mutex connection_pool_mutex;
|
|
||||||
const std::shared_ptr<Connection_config> config;
|
|
||||||
size_t maximum_pool_size = 0;
|
|
||||||
std::stack<std::unique_ptr<Connection>> free_connections;
|
|
||||||
Reconnect_policy reconnect_policy;
|
|
||||||
|
|
||||||
void free_connection(std::unique_ptr<Connection>& connection)
|
|
||||||
{
|
|
||||||
std::lock_guard<std::mutex> lock(connection_pool_mutex);
|
|
||||||
if (free_connections.size() >= maximum_pool_size)
|
|
||||||
{
|
|
||||||
// Exceeds default size, do nothign and let connection self destroy.
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (connection.get())
|
|
||||||
{
|
|
||||||
if (connection->is_valid())
|
|
||||||
{
|
|
||||||
free_connections.push(std::move(connection));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
throw sqlpp::exception("Trying to free a connection with incompatible config.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
throw sqlpp::exception("Trying to free an empty connection.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public:
|
|
||||||
connection_pool(const std::shared_ptr<Connection_config>& config, size_t pool_size)
|
|
||||||
: config(config), maximum_pool_size(pool_size), reconnect_policy(Reconnect_policy())
|
|
||||||
{
|
|
||||||
}
|
|
||||||
~connection_pool() = default;
|
|
||||||
connection_pool(const connection_pool&) = delete;
|
|
||||||
connection_pool(connection_pool&& other)
|
|
||||||
: config(std::move(other.config)),
|
|
||||||
maximum_pool_size(std::move(other.maximum_pool_size)),
|
|
||||||
reconnect_policy(std::move(other.reconnect_policy))
|
|
||||||
{
|
|
||||||
}
|
|
||||||
connection_pool& operator=(const connection_pool&) = delete;
|
|
||||||
connection_pool& operator=(connection_pool&&) = delete;
|
|
||||||
|
|
||||||
pool_connection<Connection_config, Reconnect_policy, Connection> get_connection()
|
|
||||||
{
|
|
||||||
{
|
|
||||||
std::lock_guard<std::mutex> lock(connection_pool_mutex);
|
|
||||||
if (!free_connections.empty())
|
|
||||||
{
|
|
||||||
auto connection = std::move(free_connections.top());
|
|
||||||
free_connections.pop();
|
|
||||||
return pool_connection<Connection_config, Reconnect_policy, Connection>(connection, this);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
auto c = std::unique_ptr<Connection>(new Connection(config));
|
|
||||||
return pool_connection<Connection_config, Reconnect_policy, Connection>(c, this);
|
|
||||||
}
|
|
||||||
catch (const sqlpp::exception& e)
|
|
||||||
{
|
|
||||||
std::cerr << "Failed to spawn a new connection." << std::endl;
|
|
||||||
std::cerr << e.what() << std::endl;
|
|
||||||
throw;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
template <typename Connection_config,
|
|
||||||
typename Reconnect_policy = reconnect_policy::auto_reconnect,
|
|
||||||
typename Connection = typename std::enable_if<std::is_class<typename Connection_config::connection>::value,
|
|
||||||
typename Connection_config::connection>::type>
|
|
||||||
connection_pool<Connection_config, Reconnect_policy, Connection> make_connection_pool(
|
|
||||||
const std::shared_ptr<Connection_config>& config, size_t max_pool_size)
|
|
||||||
{
|
|
||||||
return connection_pool<Connection_config, Reconnect_policy, Connection>(config, max_pool_size);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,84 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2013 - 2017, Roland Bock, Frank Park
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without modification,
|
|
||||||
* are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
*
|
|
||||||
* Redistributions in binary form must reproduce the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer in the documentation and/or
|
|
||||||
* other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
|
||||||
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef SQLPP_POOL_CONNECTION_H
|
|
||||||
#define SQLPP_POOL_CONNECTION_H
|
|
||||||
|
|
||||||
#include <memory>
|
|
||||||
|
|
||||||
namespace sqlpp
|
|
||||||
{
|
|
||||||
template <typename Connection_config, typename Reconnect_policy, typename Connection>
|
|
||||||
class connection_pool;
|
|
||||||
|
|
||||||
template <typename Connection_config,
|
|
||||||
typename Reconnect_policy,
|
|
||||||
typename Connection,
|
|
||||||
typename Connection_pool = connection_pool<Connection_config, Reconnect_policy, Connection>>
|
|
||||||
struct pool_connection
|
|
||||||
{
|
|
||||||
private:
|
|
||||||
std::unique_ptr<Connection> _impl;
|
|
||||||
Connection_pool* origin;
|
|
||||||
|
|
||||||
public:
|
|
||||||
pool_connection(std::unique_ptr<Connection>& connection, Connection_pool* origin)
|
|
||||||
: _impl(std::move(connection)), origin(origin)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
~pool_connection()
|
|
||||||
{
|
|
||||||
origin->free_connection(_impl);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename... Args>
|
|
||||||
auto operator()(Args&&... args) -> decltype((*_impl)(std::forward<Args>(args)...))
|
|
||||||
{
|
|
||||||
return (*_impl)(std::forward<Args>(args)...);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
auto operator()(const T& t) -> decltype((*_impl)(t))
|
|
||||||
{
|
|
||||||
return (*_impl)(t);
|
|
||||||
}
|
|
||||||
|
|
||||||
Connection* operator->()
|
|
||||||
{
|
|
||||||
return _impl.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
pool_connection(const pool_connection&) = delete;
|
|
||||||
pool_connection(pool_connection&& other) : _impl(std::move(other._impl)), origin(other.origin)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
pool_connection& operator=(const pool_connection&) = delete;
|
|
||||||
pool_connection& operator=(pool_connection&&) = delete;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
Loading…
Reference in New Issue
Block a user