Refactors AccountsIndex::get() #35163
Conversation
| None => AccountIndexGetResult::NotFound, | ||
| } | ||
| } | ||
| None => AccountIndexGetResult::NotFound, |
There was a problem hiding this comment.
No need to have this NotFound be duplicated.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #35163 +/- ##
=========================================
- Coverage 81.6% 81.6% -0.1%
=========================================
Files 832 832
Lines 224891 224887 -4
=========================================
- Hits 183612 183606 -6
- Misses 41279 41281 +2 |
| } | ||
| None => AccountIndexGetResult::NotFound, | ||
| } | ||
| self.get_account_read_entry(pubkey) |
There was a problem hiding this comment.
we want to get rid of ReadAccountMapEntry
I think we may get rid of all calls to get
#34918
I think we may still call get for secondary index scan (which should never be used, iirc)
There was a problem hiding this comment.
Yes, I'm working on that part too. Here was a small part that I broke off the whole work-in-progress. It was helpful for me to remove the code that was in get() that duplicates the code in get_account_read_entry(). I can stash all this and only do the changes that remove ReadAccountMapEntry too.
accounts-db/src/accounts_index.rs
Outdated
| None => AccountIndexGetResult::NotFound, | ||
| } | ||
| self.get_account_read_entry(pubkey) | ||
| .and_then(|entry| { |
There was a problem hiding this comment.
can you rename entry to locked_entry?
This will make the diff line up and me less nervous ;-)
There was a problem hiding this comment.
Done in 80da19a.
Yep, that's the plan. I'm working my way through removing the struct. Still some more to go though. |
Problem
The impl of
AccountsIndex::get()contains code duplication, and is a bit verbose.Summary of Changes
Refactor to remove code duplication and be more direct.