matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Fix Store::retrieve()

Browse source 
The previous version of `Store::retrieve()` required the entry to be
already registered in the store's hashmap.
This commit is contained in:
Julian Ganz 2016-01-24 22:26:25 +01:00
parent 4a08eed700
commit acfbb16eb2
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libimagstore/src/store.rs
View file

@ -142,14 +142,25 @@ impl Store {
/// Borrow a given Entry. When the `FileLockEntry` is either `update`d or /// Borrow a given Entry. When the `FileLockEntry` is either `update`d or
/// dropped, the new Entry is written to disk /// dropped, the new Entry is written to disk
pub fn retrieve<'a>(&'a self, id: StoreId) -> Result<FileLockEntry<'a>> { pub fn retrieve<'a>(&'a self, id: StoreId) -> Result<FileLockEntry<'a>> {
// get hold of the hashmap
let hsmap = self.entries.write(); let hsmap = self.entries.write();
if hsmap.is_err() { if hsmap.is_err() {
return Err(StoreError::new(StoreErrorKind::LockPoisoned, None)) return Err(StoreError::new(StoreErrorKind::LockPoisoned, None))
} }
hsmap.unwrap().get_mut(&id)
.ok_or(StoreError::new(StoreErrorKind::IdNotFound, None)) // either get the existing entry ot create it
.and_then(|store_entry| store_entry.get_entry()) let mut entries = hsmap.unwrap();
.and_then(|entry| Ok(FileLockEntry::new(self, entry, id))) let mut store_entry = entries.entry(id.clone()).or_insert_with(|| StoreEntry::new(id.clone()));
// make sure only one user gets a borrowed entry at a time
if store_entry.is_borrowed() {
return Err(StoreError::new(StoreErrorKind::IdLocked, None));
}
// TODO: update the store entry status
// make a file lock entry from the store entry
store_entry.get_entry().and_then(|entry| Ok(FileLockEntry::new(self, entry, id)))
} }
/// Iterate over all StoreIds for one module name /// Iterate over all StoreIds for one module name