kmwebnet/OpenSK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move transaction capacity formula to Format

Browse Source
This commit is contained in:
Julien Cretin
2020-11-03 12:39:38 +01:00
parent b97758dd99
commit d734da3a0e
3 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/persistent_store/src/store.rs
View File

@@ -262,20 +262,17 @@ impl<S: Storage> Store<S> {
if count > self.format.max_updates() {
return Err(StoreError::InvalidArgument);
}
// Compute how much capacity (including transient) we need.
// Check that the updates are valid.
let mut sorted_keys = Vec::with_capacity(count as usize);
let mut word_capacity = 1 + count;
for update in updates {
let key = usize_to_nat(update.key());
if key > self.format.max_key() {
return Err(StoreError::InvalidArgument);
}
if let Some(value) = update.value() {
let value_len = usize_to_nat(value.len());
if value_len > self.format.max_value_len() {
if usize_to_nat(value.len()) > self.format.max_value_len() {
return Err(StoreError::InvalidArgument);
}
word_capacity += self.format.bytes_to_words(value_len);
}
match sorted_keys.binary_search(&key) {
Ok(_) => return Err(StoreError::InvalidArgument),
@@ -283,7 +280,7 @@ impl<S: Storage> Store<S> {
}
}
// Reserve the capacity.
self.reserve(word_capacity)?;
self.reserve(self.format.transaction_capacity(updates))?;
// Write the marker entry.
let marker = self.tail()?;
let entry = self.format.build_internal(InternalEntry::Marker { count });