Start9/patch-db
2
0
Fork 0
mirror of https://github.com/Start9Labs/patch-db.git synced 2026-03-26 02:11:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix deadlock

Browse Source
This commit is contained in:
Aiden McClelland
2021-07-08 11:03:48 -06:00
parent 824a103e5c
commit a70d06644e
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
json-patch

Submodule json-patch updated: a2c345bd1e...c73bbd19b8

2
json-ptr

Submodule json-ptr updated: 9c9b11108b...33a2af147e

1
patch-db/src/lib.rs
View File

@@ -19,6 +19,7 @@ mod test;
pub use handle::{DbHandle, PatchDbHandle};
pub use json_ptr;
pub use json_patch;
pub use locker::{LockType, Locker};
pub use model::{
BoxModel, HasModel, Map, MapModel, Model, ModelData, ModelDataMut, OptionModel, VecModel,

9
patch-db/src/transaction.rs
View File

@@ -29,10 +29,13 @@ pub struct Transaction<Parent: DbHandle> {
impl Transaction<&mut PatchDbHandle> {
pub async fn commit(mut self, expire_id: Option<String>) -> Result<Arc<Revision>, Error> {
let store_lock = self.parent.store();
let store = store_lock.read().await;
let store = store_lock.write().await;
self.rebase()?;
let rev = self.parent.db.apply(self.updates, expire_id, None).await?;
drop(store);
let rev = self
.parent
.db
.apply(self.updates, expire_id, Some(store))
.await?;
Ok(rev)
}
pub async fn abort(mut self) -> Result<DiffPatch, Error> {