Skip to content

refactor: ember-core unreachable removal and sorted_set optimization #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kacy merged 1 commit into from
Feb 14, 2026
Merged

refactor: ember-core unreachable removal and sorted_set optimization #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 33 additions & 41 deletions crates/ember-core/src/keyspace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1096,24 +1096,22 @@ impl Keyspace {
.expect("just inserted or verified");
let old_entry_size = memory::entry_size(key, &entry.value);

if let Value::List(ref mut deque) = entry.value {
for val in values {
if left {
deque.push_front(val.clone());
} else {
deque.push_back(val.clone());
}
let Value::List(ref mut deque) = entry.value else {
return Err(WriteError::WrongType);
};
for val in values {
if left {
deque.push_front(val.clone());
} else {
deque.push_back(val.clone());
}
}
let len = deque.len();
entry.touch();

let new_entry_size = memory::entry_size(key, &entry.value);
self.memory.adjust(old_entry_size, new_entry_size);

let len = match &entry.value {
Value::List(d) => d.len(),
_ => unreachable!(),
};
Ok(len)
}

Expand All @@ -1123,25 +1121,22 @@ impl Keyspace {
return Ok(None);
}

match self.entries.get(key) {
None => return Ok(None),
Some(e) => {
if !matches!(e.value, Value::List(_)) {
return Err(WrongType);
}
}
let Some(entry) = self.entries.get_mut(key) else {
return Ok(None);
};
if !matches!(entry.value, Value::List(_)) {
return Err(WrongType);
}

let old_entry_size = memory::entry_size(key, &self.entries[key].value);
let entry = self.entries.get_mut(key).expect("verified above");
let popped = if let Value::List(ref mut deque) = entry.value {
if left {
deque.pop_front()
} else {
deque.pop_back()
}
let old_entry_size = memory::entry_size(key, &entry.value);
let Value::List(ref mut deque) = entry.value else {
// checked above
return Err(WrongType);
};
let popped = if left {
deque.pop_front()
} else {
unreachable!()
deque.pop_back()
};
entry.touch();

Expand Down Expand Up @@ -1576,21 +1571,18 @@ impl Keyspace {
.expect("just inserted or verified");
let old_entry_size = memory::entry_size(key, &entry.value);

let new_val = if let Value::Hash(ref mut map) = entry.value {
let current_val = match map.get(field) {
Some(data) => {
let s = std::str::from_utf8(data).map_err(|_| IncrError::NotAnInteger)?;
s.parse::<i64>().map_err(|_| IncrError::NotAnInteger)?
}
None => 0,
};

let new_val = current_val.checked_add(delta).ok_or(IncrError::Overflow)?;
map.insert(field.to_owned(), Bytes::from(new_val.to_string()));
new_val
} else {
unreachable!()
let Value::Hash(ref mut map) = entry.value else {
return Err(IncrError::WrongType);
};
let current_val = match map.get(field) {
Some(data) => {
let s = std::str::from_utf8(data).map_err(|_| IncrError::NotAnInteger)?;
s.parse::<i64>().map_err(|_| IncrError::NotAnInteger)?
}
None => 0,
};
let new_val = current_val.checked_add(delta).ok_or(IncrError::Overflow)?;
map.insert(field.to_owned(), Bytes::from(new_val.to_string()));
entry.touch();

let new_entry_size = memory::entry_size(key, &entry.value);
Expand Down
8 changes: 4 additions & 4 deletions crates/ember-core/src/types/sorted_set.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ impl SortedSet {
}
// update: remove old entry, insert new
self.tree.remove(&(old_score, member.clone()));
self.tree.insert((new_score, member.clone()), ());
self.scores.insert(member, new_score);
self.scores.insert(member.clone(), new_score);
self.tree.insert((new_score, member), ());
AddResult {
added: false,
updated: true,
Expand All @@ -110,8 +110,8 @@ impl SortedSet {
updated: false,
};
}
self.tree.insert((new_score, member.clone()), ());
self.scores.insert(member, new_score);
self.scores.insert(member.clone(), new_score);
self.tree.insert((new_score, member), ());
AddResult {
added: true,
updated: false,
Expand Down