matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Fix Store::move_by_id(): Move in cache as well

Browse source
This commit is contained in:
Matthias Beyer 2016-09-22 08:39:00 +02:00
parent caa214f1bd
commit 4f83b22b98
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libimagstore/src/store.rs
View file

@ -662,11 +662,15 @@ impl Store {
} }
{ {
let hsmap = match self.entries.write() { let mut hsmap = match self.entries.write() {
Err(_) => return Err(SE::new(SEK::LockPoisoned, None)), Err(_) => return Err(SE::new(SEK::LockPoisoned, None)),
Ok(m) => m, Ok(m) => m,
}; };
if hsmap.contains_key(&new_id) {
return Err(SEK::EntryAlreadyExists.into_error());
}
if !hsmap.contains_key(&old_id) { if !hsmap.contains_key(&old_id) {
return Err(SE::new(SEK::EntryAlreadyBorrowed, None)); return Err(SE::new(SEK::EntryAlreadyBorrowed, None));
} else { } else {
@ -675,7 +679,13 @@ impl Store {
match FileAbstraction::rename(&old_id_pb, &new_id_pb) { match FileAbstraction::rename(&old_id_pb, &new_id_pb) {
Err(e) => return Err(SEK::EntryRenameError.into_error_with_cause(Box::new(e))), Err(e) => return Err(SEK::EntryRenameError.into_error_with_cause(Box::new(e))),
Ok(_) => { Ok(_) => {
debug!("Rename worked"); debug!("Rename worked on filesystem");
// assert enforced through check hsmap.contains_key(&new_id) above.
// Should therefor never fail
assert!(hsmap
.remove(&old_id)
.and_then(|entry| hsmap.insert(new_id.clone(), entry)).is_none())
} }
} }
} }
@ -2395,7 +2405,8 @@ mod store_tests {
assert!(r.map_err(|e| println!("ERROR: {:?}", e)).is_ok()); assert!(r.map_err(|e| println!("ERROR: {:?}", e)).is_ok());
{ {
assert!(store.entries.read().unwrap().get(&id_mv).is_some()); let id_mv_with_base = id_mv.clone().with_base(store.path().clone());
assert!(store.entries.read().unwrap().get(&id_mv_with_base).is_some());
} }
} }
} }