dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Rewrite epoch_upgrader in terms of receivable iterators.

Browse source
This commit is contained in:
Colin LeMahieu 2024-03-16 19:13:51 +00:00
commit 773cd91f1b
No known key found for this signature in database
GPG key ID: 43708520C8DFB938
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
nano/node/epoch_upgrader.cpp
View file

@ -210,14 +210,13 @@ void nano::epoch_upgrader::upgrade_impl (nano::raw_key const & prv_a, nano::epoc
std::atomic<uint64_t> upgraded_pending (0); std::atomic<uint64_t> upgraded_pending (0);
uint64_t workers (0); uint64_t workers (0);
uint64_t attempts (0); uint64_t attempts (0);
auto transaction (store.tx_begin_read ()); auto transaction = store.tx_begin_read ();
for (auto i (store.pending.begin (transaction, nano::pending_key (1, 0))), n (store.pending.end ()); i != n && attempts < upgrade_batch_size && attempts < count_limit && !stopped;) for (auto current = ledger.receivable_upper_bound (transaction, 0), end = ledger.receivable_end (); current != end && attempts < upgrade_batch_size && attempts < count_limit && !stopped;)
{ {
bool to_next_account (false); bool to_next_account (false);
nano::pending_key const & key (i->first); auto const & [key, info] = *current;
if (!store.account.exists (transaction, key.account)) if (!store.account.exists (transaction, key.account))
{ {
nano::pending_info const & info (i->second);
if (info.epoch < epoch_a) if (info.epoch < epoch_a)
{ {
++attempts; ++attempts;
@ -272,13 +271,13 @@ void nano::epoch_upgrader::upgrade_impl (nano::raw_key const & prv_a, nano::epoc
} }
else else
{ {
i = store.pending.begin (transaction, nano::pending_key (key.account.number () + 1, 0)); current = ledger.receivable_upper_bound (transaction, key.account);
} }
} }
else else
{ {
// Move to next pending item // Move to next pending item
++i; current = ledger.receivable_upper_bound (transaction, key.account, key.hash);
} }
} }
{ {