Simplify InMemAccountsIndex eviction code #8815
Merged
Conversation
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
HaoranYi
changed the title
HaoranYi
force-pushed
the
possible_eviction
branch
from
910aa41 to
95ae604
Compare
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## master #8815 +/- ##
=======================================
Coverage 83.2% 83.2%
=======================================
Files 863 863
Lines 373689 373660 -29
=======================================
+ Hits 310984 311022 +38
+ Misses 62705 62638 -67 🚀 New features to boost your workflow:
|
roryharr
reviewed
Nov 4, 2025
roryharr
reviewed
Nov 4, 2025
HaoranYi
force-pushed
the
possible_eviction
branch
from
5d5c512 to
d72ef0a
Compare
The PossibleEvictions struct was used to cache FlushScanResult instances, but only one FlushScanResult is ever created at a time (with reset(1) and new(1)). This commit removes the cache and creates the vec locally in flush_scan where it's needed, simplifying the code and reducing memory usage.
FlushScanResult was just a wrapper around a single Vec. This commit removes the wrapper struct and uses Vec<(Pubkey, bool)> directly, further simplifying the code.
HaoranYi
force-pushed
the
possible_eviction
branch
from
d72ef0a to
97ce22f
Compare
brooksprumo
reviewed
Nov 4, 2025
roryharr
previously approved these changes
Nov 4, 2025
Co-authored-by: Brooks <[email protected]>
brooksprumo
approved these changes
Nov 5, 2025
| let mut possible_evictions = self.possible_evictions.write().unwrap(); | ||
| possible_evictions.reset(1); | ||
| ) -> Vec<(Pubkey, /*is_dirty*/ bool)> { | ||
| let mut possible_evictions = Vec::new(); |
There was a problem hiding this comment.
And now that we always start with a new vec for possible_evictions, we can change gather_possible_evictions() to return the Vec, instead of taking it as an in-out param.
For a followup PR though.
Author
There was a problem hiding this comment.
yeah. good idea. will do it in a follow up pr.
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.
Problem
InMemAccountsIndexhas two unnecessary layers of abstraction for managing evictions:PossibleEvictions - A caching struct that always operates with size 1 (
new(1),reset(1),insert(0, ...)). Only oneFlushScanResultis ever created and used at a time, making the caching unnecessary.FlushScanResult - A wrapper struct around a single
Vec<(Pubkey, bool)>with no additional functionality.Summary of change
PossibleEvictionsstruct and its field fromInMemAccountsIndexFlushScanResultstructflush_scanand return it directly asVec<(Pubkey, bool)>gather_possible_evictionsto work with the vec directlyNet result: 79 lines of code removed, simpler and more direct eviction logic.