Austin Bonander eff7c9e125
fix Pool to remove possibility of "leaking" connections (#84)
* fix `Pool` to reduce possibility of "leaking" connections

now uses RAII guards to control `SharedPool::size`

* add smoke test for `Pool` to both Postgres and MySQL tests

add `Pool::is_closed()`

* fix documentation re: pool

* refactor pool implementation to not use futures oneshot channels

https://github.com/launchbadge/sqlx/pull/84#issuecomment-580476223

* run cargo fmt

* Pool: remove superfluous guard struct, document some internal methods
2020-01-31 23:33:42 -08:00

162 lines
4.7 KiB
Rust

//! **Pool** for SQLx database connections.
use std::{
fmt,
sync::Arc,
time::{Duration, Instant},
};
use crate::connection::{Connect, Connection};
use crate::transaction::Transaction;
use self::inner::SharedPool;
use self::options::Options;
pub use self::conn::PoolConnection;
mod conn;
mod executor;
mod inner;
mod options;
pub use self::options::Builder;
/// A pool of database connections.
pub struct Pool<C>(Arc<SharedPool<C>>);
impl<C> Pool<C>
where
C: Connection + Connect<Connection = C>,
{
/// Creates a connection pool with the default configuration.
///
/// The connection URL syntax is documented on the connection type for the respective
/// database you're connecting to:
///
/// * MySQL/MariaDB: [crate::mysql::MySqlConnection]
/// * PostgreSQL: [crate::postgres::PgConnection]
pub async fn new(url: &str) -> crate::Result<Self> {
Self::builder().build(url).await
}
async fn with_options(url: &str, options: Options) -> crate::Result<Self> {
let inner = SharedPool::new_arc(url, options).await?;
Ok(Pool(inner))
}
/// Returns a [Builder] to configure a new connection pool.
pub fn builder() -> Builder<C> {
Builder::new()
}
/// Retrieves a connection from the pool.
///
/// Waits for at most the configured connection timeout before returning an error.
pub async fn acquire(&self) -> crate::Result<PoolConnection<C>> {
self.0.acquire().await.map(|conn| conn.attach(&self.0))
}
/// Attempts to retrieve a connection from the pool if there is one available.
///
/// Returns `None` immediately if there are no idle connections available in the pool.
pub fn try_acquire(&self) -> Option<PoolConnection<C>> {
self.0.try_acquire().map(|conn| conn.attach(&self.0))
}
/// Retrieves a new connection and immediately begins a new transaction.
pub async fn begin(&self) -> crate::Result<Transaction<PoolConnection<C>>> {
Ok(Transaction::new(0, self.acquire().await?).await?)
}
/// Ends the use of a connection pool. Prevents any new connections
/// and will close all active connections when they are returned to the pool.
///
/// Does not resolve until all connections are closed.
pub async fn close(&self) {
self.0.close().await;
}
/// Returns `true` if [`.close()`][Pool::close] has been called on the pool, `false` otherwise.
pub fn is_closed(&self) -> bool {
self.0.is_closed()
}
/// Returns the number of connections currently being managed by the pool.
pub fn size(&self) -> u32 {
self.0.size()
}
/// Returns the number of idle connections.
pub fn idle(&self) -> usize {
self.0.num_idle()
}
/// Returns the configured maximum pool size.
pub fn max_size(&self) -> u32 {
self.0.options().max_size
}
/// Returns the maximum time spent acquiring a new connection before an error is returned.
pub fn connect_timeout(&self) -> Duration {
self.0.options().connect_timeout
}
/// Returns the configured minimum idle connection count.
pub fn min_size(&self) -> u32 {
self.0.options().min_size
}
/// Returns the configured maximum connection lifetime.
pub fn max_lifetime(&self) -> Option<Duration> {
self.0.options().max_lifetime
}
/// Returns the configured idle connection timeout.
pub fn idle_timeout(&self) -> Option<Duration> {
self.0.options().idle_timeout
}
}
/// Returns a new [Pool] tied to the same shared connection pool.
impl<C> Clone for Pool<C> {
fn clone(&self) -> Self {
Self(Arc::clone(&self.0))
}
}
impl<C> fmt::Debug for Pool<C>
where
C: Connection + Connect<Connection = C>,
{
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
fmt.debug_struct("Pool")
.field("url", &self.0.url())
.field("size", &self.0.size())
.field("num_idle", &self.0.num_idle())
.field("is_closed", &self.0.is_closed())
.field("options", self.0.options())
.finish()
}
}
/// get the time between the deadline and now and use that as our timeout
///
/// returns `Error::PoolTimedOut` if the deadline is in the past
fn deadline_as_timeout(deadline: Instant) -> crate::Result<Duration> {
deadline
.checked_duration_since(Instant::now())
.ok_or(crate::Error::PoolTimedOut(None))
}
#[test]
fn assert_pool_traits() {
fn assert_send_sync<T: Send + Sync>() {}
fn assert_clone<T: Clone>() {}
fn assert_pool<C: Connection + Connect<Connection = C>>() {
assert_send_sync::<Pool<C>>();
assert_clone::<Pool<C>>();
}
}