Skip to content
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

Refactor data structure representing account candidates for cleaning #2296

Merged
merged 32 commits into from
Aug 8, 2024
Merged
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
218b21c
Refactor data structure representing account candidates for cleaning
dmakarov Jul 25, 2024
4736bf9
Remove redundant method of CleaningInfo and make its fields private
dmakarov Jul 26, 2024
cea2b97
Rework pubkey_to_slot_set construction
dmakarov Jul 26, 2024
2134606
Use slice instead of Vec in parameter types
dmakarov Jul 26, 2024
d336db1
Remove redundant duplicate expression
dmakarov Jul 26, 2024
158093f
Fix tests build
dmakarov Jul 26, 2024
f18a64d
Replace Vec by Box
dmakarov Jul 27, 2024
443cb89
Fix clippy error
dmakarov Jul 27, 2024
3db470f
Add missing expect() message
dmakarov Jul 27, 2024
bb8cc3f
Update expect message
dmakarov Jul 29, 2024
77ffc2a
Remove unnecessary check for empty bins
dmakarov Jul 29, 2024
9225b4a
Remove redundant type specification
dmakarov Jul 29, 2024
1affff3
Formatting fixes
dmakarov Jul 29, 2024
51cb458
Exclude accounts with empty slot list
dmakarov Jul 29, 2024
11df2e5
Fix name in an info message
dmakarov Jul 30, 2024
388fc20
Call scan once per pubkey
dmakarov Jul 30, 2024
d11c8e0
Fix deadlock in test
dmakarov Jul 30, 2024
44b79ed
Remove redundant variable
dmakarov Jul 30, 2024
dd258b0
Find affected pubkey in all bins
dmakarov Jul 30, 2024
1bb2452
Undo BINS_FOR_TESTING change
dmakarov Jul 30, 2024
f140b66
Avoid acquiring read lock twice in same thread
dmakarov Jul 31, 2024
437182c
comments
dmakarov Aug 1, 2024
4f1994d
comments
dmakarov Aug 1, 2024
2b7efbf
replace if-then-else by then_some
dmakarov Aug 5, 2024
b48e6dd
Don't retain entries with empty slot list
dmakarov Aug 6, 2024
e1664eb
add filtering on store counts loop
jeffwashington Aug 6, 2024
3d7f48c
fix fmting on scan_accounts
jeffwashington Aug 6, 2024
8e80e90
extract out count_pubkeys
jeffwashington Aug 6, 2024
42d58d0
extract out `insert_pubkey`
jeffwashington Aug 6, 2024
0b0a29c
fix fmt on `retain`
jeffwashington Aug 6, 2024
a58bd1d
Remove hashset_to_vec timer
dmakarov Aug 7, 2024
f45f0af
comments
dmakarov Aug 7, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions accounts-db/src/accounts_db.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,6 @@ pub enum AccountsHashVerificationError {
struct CleanKeyTimings {
collect_delta_keys_us: u64,
delta_insert_us: u64,
hashset_to_vec_us: u64,
dirty_store_processing_us: u64,
delta_key_count: u64,
dirty_pubkeys_count: u64,
Expand Down Expand Up @@ -3130,10 +3129,6 @@ impl AccountsDb {

timings.delta_key_count = Self::count_pubkeys(&candidates);

let mut hashset_to_vec = Measure::start("flat_map");
hashset_to_vec.stop();
timings.hashset_to_vec_us += hashset_to_vec.as_us();

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ha. it was never dumped out anyway.


// Check if we should purge any of the zero_lamport_accounts_to_purge_later, based on the
// latest_full_snapshot_slot.
let latest_full_snapshot_slot = self.latest_full_snapshot_slot();
Expand Down