Deuxfleurs/garage
48
56
Fork 73
Code Issues 100 Pull requests 13 Releases 30 Wiki Activity

Some improvements to Garage internals #451

Merged
lx merged 14 commits from internals-rework into main 2023-01-03 11:37:32 +00:00
Conversation 0 Commits 14 Files changed 27 +4 -5
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 13c8662126 - Show all commits

9
src/table/data.rs
View file

@ -330,13 +330,12 @@ where
let mut entry = self.decode_entry(&old_v).map_err(db::TxError::Abort)?; let mut entry = self.decode_entry(&old_v).map_err(db::TxError::Abort)?;
entry.merge(ins); entry.merge(ins);
rmp_to_vec_all_named(&entry) rmp_to_vec_all_named(&entry)
.map_err(Error::RmpEncode)
.map_err(db::TxError::Abort)?
} }
None => rmp_to_vec_all_named(ins) None => rmp_to_vec_all_named(ins),
.map_err(Error::RmpEncode)
.map_err(db::TxError::Abort)?,
}; };
let new_entry = new_entry
.map_err(Error::RmpEncode)
.map_err(db::TxError::Abort)?;
tx.insert(&self.insert_queue, &tree_key, new_entry)?; tx.insert(&self.insert_queue, &tree_key, new_entry)?;
self.insert_queue_notify.notify_one(); self.insert_queue_notify.notify_one();