Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove duplication between transaction and room_transaction

Browse source
This commit is contained in:
Antonio Scandurra 2022-12-05 09:46:03 +01:00
parent d96f524fb6
commit 0ed731780a
1 changed files with 27 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

57
crates/collab/src/db.rs
View file

@ -2133,21 +2133,7 @@ impl Database {
{ {
let body = async { let body = async {
loop { loop {
let tx = self.pool.begin().await?; let (tx, result) = self.with_transaction(&f).await?;
// In Postgres, serializable transactions are opt-in
if let DatabaseBackend::Postgres = self.pool.get_database_backend() {
tx.execute(Statement::from_string(
DatabaseBackend::Postgres,
"SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;".into(),
))
.await?;
}
let mut tx = Arc::new(Some(tx));
let result = f(TransactionHandle(tx.clone())).await;
let tx = Arc::get_mut(&mut tx).unwrap().take().unwrap();
match result { match result {
Ok(result) => { Ok(result) => {
tx.commit().await?; tx.commit().await?;
@ -2196,21 +2182,7 @@ impl Database {
{ {
let body = async { let body = async {
loop { loop {
let tx = self.pool.begin().await?; let (tx, result) = self.with_transaction(&f).await?;
// In Postgres, serializable transactions are opt-in
if let DatabaseBackend::Postgres = self.pool.get_database_backend() {
tx.execute(Statement::from_string(
DatabaseBackend::Postgres,
"SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;".into(),
))
.await?;
}
let mut tx = Arc::new(Some(tx));
let result = f(TransactionHandle(tx.clone())).await;
let tx = Arc::get_mut(&mut tx).unwrap().take().unwrap();
match result { match result {
Ok((room_id, data)) => { Ok((room_id, data)) => {
let lock = self.rooms.entry(room_id).or_default().clone(); let lock = self.rooms.entry(room_id).or_default().clone();
@ -2257,6 +2229,31 @@ impl Database {
body.await body.await
} }
} }
async fn with_transaction<F, Fut, T>(&self, f: &F) -> Result<(DatabaseTransaction, Result<T>)>
where
F: Send + Fn(TransactionHandle) -> Fut,
Fut: Send + Future<Output = Result<T>>,
{
let tx = self.pool.begin().await?;
// In Postgres, serializable transactions are opt-in
if let DatabaseBackend::Postgres = self.pool.get_database_backend() {
tx.execute(Statement::from_string(
DatabaseBackend::Postgres,
"SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;".into(),
))
.await?;
}
let mut tx = Arc::new(Some(tx));
let result = f(TransactionHandle(tx.clone())).await;
let Some(tx) = Arc::get_mut(&mut tx).and_then(|tx| tx.take()) else {
return Err(anyhow!("couldn't complete transaction because it's still in use"))?;
};
Ok((tx, result))
}
} }
struct TransactionHandle(Arc<Option<DatabaseTransaction>>); struct TransactionHandle(Arc<Option<DatabaseTransaction>>);