perf: faster node traversal and entry extraction in BTreeMap#363
Merged
perf: faster node traversal and entry extraction in BTreeMap#363
Conversation
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR refactors entry extraction for better performance by renaming into_entry and using in-place removal, and updates traversal logic and benchmarks accordingly.
- Renamed
into_entrytoextract_entry_atand changed its signature to take&mut self. - Replaced
mem::take+nthwithswap_removefor O(1) removal. - Updated traversal logic in
btreemap.rsto pass mutable nodes and call the new method. - Benchmarks YAML updated with new instruction counts.
Reviewed Changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/btreemap/node.rs | Renamed and refactored entry-extraction method |
| src/btreemap.rs | Updated traversal and extraction call sites |
| benchmarks/*.yml | Adjusted benchmark results after refactor |
Comments suppressed due to low confidence (3)
src/btreemap/node.rs:321
- [nitpick] The doc comment is outdated: extract_entry_at no longer consumes the node. Update it to reflect that it mutably extracts without consuming.
/// Returns the entry at the specified index while consuming this node.
src/btreemap/node.rs:322
- [nitpick] Consider adding unit tests for extract_entry_at to verify correct removal behavior and that B-tree invariants hold after extraction.
pub fn extract_entry_at<M: Memory>(&mut self, idx: usize, memory: &M) -> Entry<K> {
src/btreemap/node.rs:323
- Using swap_remove here can break the sorted order of entries, violating B-tree invariants. Consider using Vec::remove(idx) to preserve ordering even if it is O(n).
let (key, value) = self.entries.swap_remove(idx);
maksymar
changed the title
maksymar
changed the title
|
|
|
|
|
maksymar
commented
Jul 7, 2025
michael-weigelt
approved these changes
Jul 7, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Improve performance of node-tree traversal and entry extraction in
BTreeMap.mem::take+nthwithswap_removefor efficient O(1) removalselfto&mut selfinextract_entry_atto avoid unnecessary movesinto_entrytoextract_entry_atto match Rust naming conventions (into_*typically consumesself)btreemap
Google sheets CSV report.