-
Notifications
You must be signed in to change notification settings - Fork 298
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
Open
morrisonlevi
wants to merge
3
commits into
rust-lang:master
Choose a base branch
from
morrisonlevi:safe-insert-within-capacity
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
||
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), | ||
} | ||
} | ||
|
||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.