mirror of
https://gitlab.com/famedly/conduit.git
synced 2025-06-27 16:35:59 +00:00
fix: atomic increment
This commit is contained in:
parent
2ebe6853be
commit
4556db411d
1 changed files with 17 additions and 2 deletions
|
@ -16,6 +16,7 @@ pub struct RocksDbEngineTree<'a> {
|
||||||
db: Arc<Engine>,
|
db: Arc<Engine>,
|
||||||
name: &'a str,
|
name: &'a str,
|
||||||
watchers: RwLock<HashMap<Vec<u8>, Vec<tokio::sync::oneshot::Sender<()>>>>,
|
watchers: RwLock<HashMap<Vec<u8>, Vec<tokio::sync::oneshot::Sender<()>>>>,
|
||||||
|
write_lock: RwLock<()>
|
||||||
}
|
}
|
||||||
|
|
||||||
impl DatabaseEngine for Engine {
|
impl DatabaseEngine for Engine {
|
||||||
|
@ -77,6 +78,7 @@ impl DatabaseEngine for Engine {
|
||||||
name,
|
name,
|
||||||
db: Arc::clone(self),
|
db: Arc::clone(self),
|
||||||
watchers: RwLock::new(HashMap::new()),
|
watchers: RwLock::new(HashMap::new()),
|
||||||
|
write_lock: RwLock::new(()),
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -120,7 +122,13 @@ impl Tree for RocksDbEngineTree<'_> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(self.db.rocks.put_cf(self.cf(), key, value)?)
|
let lock = self.write_lock.read().unwrap();
|
||||||
|
|
||||||
|
let result = self.db.rocks.put_cf(self.cf(), key, value)?;
|
||||||
|
|
||||||
|
drop(lock);
|
||||||
|
|
||||||
|
Ok(result)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn insert_batch<'a>(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()> {
|
fn insert_batch<'a>(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()> {
|
||||||
|
@ -168,20 +176,27 @@ impl Tree for RocksDbEngineTree<'_> {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn increment(&self, key: &[u8]) -> Result<Vec<u8>> {
|
fn increment(&self, key: &[u8]) -> Result<Vec<u8>> {
|
||||||
// TODO: make atomic
|
let lock = self.write_lock.write().unwrap();
|
||||||
|
|
||||||
let old = self.db.rocks.get_cf(self.cf(), &key)?;
|
let old = self.db.rocks.get_cf(self.cf(), &key)?;
|
||||||
let new = utils::increment(old.as_deref()).unwrap();
|
let new = utils::increment(old.as_deref()).unwrap();
|
||||||
self.db.rocks.put_cf(self.cf(), key, &new)?;
|
self.db.rocks.put_cf(self.cf(), key, &new)?;
|
||||||
|
|
||||||
|
drop(lock);
|
||||||
Ok(new)
|
Ok(new)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn increment_batch<'a>(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()> {
|
fn increment_batch<'a>(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()> {
|
||||||
|
let lock = self.write_lock.write().unwrap();
|
||||||
|
|
||||||
for key in iter {
|
for key in iter {
|
||||||
let old = self.db.rocks.get_cf(self.cf(), &key)?;
|
let old = self.db.rocks.get_cf(self.cf(), &key)?;
|
||||||
let new = utils::increment(old.as_deref()).unwrap();
|
let new = utils::increment(old.as_deref()).unwrap();
|
||||||
self.db.rocks.put_cf(self.cf(), key, new)?;
|
self.db.rocks.put_cf(self.cf(), key, new)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
drop(lock);
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue