mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-25 22:01:19 +00:00
Allow better query plans (#4424)
* Update utils.rs * Create bind_if_some.rs * limit connection age * Delete crates/db_schema/src/utils/bind_if_some.rs * Update utils.rs * Update utils.rs * Update utils.rs * Update utils.rs * Update utils.rs * Update utils.rs * Update utils.rs * Update utils.rs * Update utils.rs * Update utils.rs * Update utils.rs * Update utils.rs * Update utils.rs
This commit is contained in:
parent
300869d397
commit
677d54ae57
1 changed files with 21 additions and 3 deletions
|
@ -25,10 +25,11 @@ use diesel::{
|
||||||
use diesel_async::{
|
use diesel_async::{
|
||||||
pg::AsyncPgConnection,
|
pg::AsyncPgConnection,
|
||||||
pooled_connection::{
|
pooled_connection::{
|
||||||
deadpool::{Object as PooledConnection, Pool},
|
deadpool::{Hook, HookError, Object as PooledConnection, Pool},
|
||||||
AsyncDieselConnectionManager,
|
AsyncDieselConnectionManager,
|
||||||
ManagerConfig,
|
ManagerConfig,
|
||||||
},
|
},
|
||||||
|
SimpleAsyncConnection,
|
||||||
};
|
};
|
||||||
use diesel_migrations::EmbeddedMigrations;
|
use diesel_migrations::EmbeddedMigrations;
|
||||||
use futures_util::{future::BoxFuture, Future, FutureExt};
|
use futures_util::{future::BoxFuture, Future, FutureExt};
|
||||||
|
@ -46,7 +47,7 @@ use rustls::{
|
||||||
use std::{
|
use std::{
|
||||||
ops::{Deref, DerefMut},
|
ops::{Deref, DerefMut},
|
||||||
sync::Arc,
|
sync::Arc,
|
||||||
time::SystemTime,
|
time::{Duration, SystemTime},
|
||||||
};
|
};
|
||||||
use tracing::{error, info};
|
use tracing::{error, info};
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
@ -335,7 +336,14 @@ fn establish_connection(config: &str) -> BoxFuture<ConnectionResult<AsyncPgConne
|
||||||
error!("Database connection failed: {e}");
|
error!("Database connection failed: {e}");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
AsyncPgConnection::try_from(client).await
|
let mut conn = AsyncPgConnection::try_from(client).await?;
|
||||||
|
// * Change geqo_threshold back to default value if it was changed, so it's higher than the collapse limits
|
||||||
|
// * Change collapse limits from 8 to 11 so the query planner can find a better table join order for more complicated queries
|
||||||
|
conn
|
||||||
|
.batch_execute("SET geqo_threshold=12;SET from_collapse_limit=11;SET join_collapse_limit=11;")
|
||||||
|
.await
|
||||||
|
.map_err(ConnectionError::CouldntSetupConfiguration)?;
|
||||||
|
Ok(conn)
|
||||||
};
|
};
|
||||||
fut.boxed()
|
fut.boxed()
|
||||||
}
|
}
|
||||||
|
@ -389,6 +397,16 @@ pub async fn build_db_pool() -> Result<ActualDbPool, LemmyError> {
|
||||||
let pool = Pool::builder(manager)
|
let pool = Pool::builder(manager)
|
||||||
.max_size(SETTINGS.database.pool_size)
|
.max_size(SETTINGS.database.pool_size)
|
||||||
.runtime(Runtime::Tokio1)
|
.runtime(Runtime::Tokio1)
|
||||||
|
// Limit connection age to prevent use of prepared statements that have query plans based on very old statistics
|
||||||
|
.pre_recycle(Hook::sync_fn(|_conn, metrics| {
|
||||||
|
// Preventing the first recycle can cause an infinite loop when trying to get a new connection from the pool
|
||||||
|
let conn_was_used = metrics.recycled.is_some();
|
||||||
|
if metrics.age() > Duration::from_secs(3 * 24 * 60 * 60) && conn_was_used {
|
||||||
|
Err(HookError::Continue(None))
|
||||||
|
} else {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}))
|
||||||
.build()?;
|
.build()?;
|
||||||
|
|
||||||
run_migrations(&db_url)?;
|
run_migrations(&db_url)?;
|
||||||
|
|
Loading…
Reference in a new issue