This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
Trie optimizations #6389
Merged
Trie optimizations #6389
Conversation
This file contains 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
debris
added
A0-pleasereview 🤓
debris
commented
Aug 26, 2017
| match self.data.entry(key) { | ||
| Entry::Occupied(mut entry) => { | ||
| let &mut (ref mut old_value, ref mut rc) = entry.get_mut(); | ||
| if *rc >= -0x80000000i32 && *rc <= 0 { |
There was a problem hiding this comment.
rc >= -0x80000000i32 is probably not needed, right @rphmeier ?
arkpar
reviewed
Aug 28, 2017
| @@ -181,7 +181,10 @@ impl HashDB for MemoryDB { | |||
| } | |||
|
|
|||
| fn keys(&self) -> HashMap<H256, i32> { | |||
| self.data.iter().filter_map(|(k, v)| if v.1 != 0 {Some((k.clone(), v.1))} else {None}).collect() | |||
| self.data.iter() | |||
There was a problem hiding this comment.
Why remove a filter_map? Clippy produces a warning on .filter().map() sequence
There was a problem hiding this comment.
ah, ok
I just found it more readable than this long one-liner
arkpar
reviewed
Aug 28, 2017
util/src/trie/triedb.rs
Outdated
| node: node.clone().into(), | ||
| }); | ||
| } | ||
| fn seek_descend<'key>(&mut self, mut node_data: DBValue, mut key: NibbleSlice<'key>) -> super::Result<()> { |
There was a problem hiding this comment.
Should be renamed to just seek since it is not recursive anymore.
arkpar
reviewed
Aug 28, 2017
util/src/trie/triedb.rs
Outdated
| fn seek_descend<'key>(&mut self, mut node_data: DBValue, mut key: NibbleSlice<'key>) -> super::Result<()> { | ||
| enum Step { | ||
| Descend(DBValue, usize), | ||
| Return, |
There was a problem hiding this comment.
This could be just a return statement
arkpar
added
A5-grumble 🔥
debris
added
A0-pleasereview 🤓
|
@arkpar fixed |
arkpar
added
A8-looksgood 🦄
|
js failure is unrelated |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
changes:
insert,removeandemplacekeys()all trie insert benchmarks are about 10% faster