-
Notifications
You must be signed in to change notification settings - Fork 308
feat: HashTable::try_insert_unique_within_capacity
#621
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.
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
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1045,18 +1045,15 @@ impl<T, A: Allocator> RawTable<T, A> { | |
) | ||
} | ||
|
||
/// Inserts a new element into the table, and returns its raw bucket. | ||
/// | ||
/// This does not check if the given element already exists in the table. | ||
#[cfg_attr(feature = "inline-more", inline)] | ||
pub fn insert(&mut self, hash: u64, value: T, hasher: impl Fn(&T) -> u64) -> Bucket<T> { | ||
#[inline(always)] | ||
fn find_insert_slot(&self, hash: u64) -> Option<InsertSlot> { | ||
unsafe { | ||
// SAFETY: | ||
// 1. The [`RawTableInner`] must already have properly initialized control bytes since | ||
// we will never expose `RawTable::new_uninitialized` in a public API. | ||
// | ||
// 2. We reserve additional space (if necessary) right after calling this function. | ||
let mut slot = self.table.find_insert_slot(hash); | ||
let slot = self.table.find_insert_slot(hash); | ||
|
||
// We can avoid growing the table once we have reached our load factor if we are replacing | ||
// a tombstone. This works since the number of EMPTY slots does not change in this case. | ||
|
@@ -1065,13 +1062,46 @@ impl<T, A: Allocator> RawTable<T, A> { | |
// in the range `0..=self.buckets()`. | ||
let old_ctrl = *self.table.ctrl(slot.index); | ||
if unlikely(self.table.growth_left == 0 && old_ctrl.special_is_empty()) { | ||
None | ||
} else { | ||
Some(slot) | ||
} | ||
} | ||
} | ||
|
||
/// Inserts a new element into the table, and returns its raw bucket. | ||
/// | ||
/// This does not check if the given element already exists in the table. | ||
#[cfg_attr(feature = "inline-more", inline)] | ||
pub fn insert(&mut self, hash: u64, value: T, hasher: impl Fn(&T) -> u64) -> Bucket<T> { | ||
let slot = match self.find_insert_slot(hash) { | ||
None => { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I suppose someone should check if the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You can use |
||
self.reserve(1, hasher); | ||
// SAFETY: We know for sure that `RawTableInner` has control bytes | ||
// initialized and that there is extra space in the table. | ||
slot = self.table.find_insert_slot(hash); | ||
unsafe { self.table.find_insert_slot(hash) } | ||
} | ||
Some(slot) => slot, | ||
}; | ||
// SAFETY: todo | ||
unsafe { self.insert_in_slot(hash, slot, value) } | ||
} | ||
|
||
self.insert_in_slot(hash, slot, value) | ||
/// Tries to insert a new element into the table if there is capacity. | ||
/// Returns its raw bucket if successful, and otherwise returns `value` | ||
/// to the caller on error. | ||
/// | ||
/// This does not check if the given element already exists in the table. | ||
#[inline] | ||
pub(crate) fn try_insert_within_capacity( | ||
&mut self, | ||
hash: u64, | ||
value: T, | ||
) -> Result<Bucket<T>, T> { | ||
match self.find_insert_slot(hash) { | ||
// SAFETY: todo | ||
Some(slot) => Ok(unsafe { self.insert_in_slot(hash, slot, value) }), | ||
None => Err(value), | ||
} | ||
} | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I used
#[inline(always)]
unconditionally because this is a helper method which was previously written in line, so I didn't want to worry about abstraction overhead.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A simple
#[inline]
would be sufficient here. We don't want to over-inline in debug builds since this can hurt build times.