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.

Sign up for GitHub

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

[Perf] Use rayon to obtain pending certificates #3463

Merged
merged 2 commits into from
Jan 25, 2025
Merged

[Perf] Use rayon to obtain pending certificates #3463

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e772f9e
perf: use rayon to obtain pending certificates
ljedrz Jan 7, 2025
c94f38e
Merge branch 'staging' into perf/faster_get_pending_certs
raychu86 Jan 24, 2025
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
35 changes: 16 additions & 19 deletions node/bft/src/helpers/storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ use snarkvm::{
narwhal::{BatchCertificate, BatchHeader, Transmission, TransmissionID},
},
prelude::{Address, Field, Network, Result, anyhow, bail, ensure},
utilities::{cfg_into_iter, cfg_sorted_by},
};

use indexmap::{IndexMap, IndexSet, map::Entry};
use lru::LruCache;
use parking_lot::RwLock;
use rayon::iter::{IntoParallelIterator, ParallelIterator};
use std::{
collections::{HashMap, HashSet},
num::NonZeroUsize,
Expand Down Expand Up @@ -377,30 +379,25 @@ impl<N: Network> Storage<N> {
/// Returns the certificates that have not yet been included in the ledger.
/// Note that the order of this set is by round and then insertion.
pub(crate) fn get_pending_certificates(&self) -> IndexSet<BatchCertificate<N>> {
let mut pending_certificates = IndexSet::new();

// Obtain the read locks.
let rounds = self.rounds.read();
let certificates = self.certificates.read();

// Iterate over the rounds.
for (_, certificates_for_round) in rounds.clone().sorted_by(|a, _, b, _| a.cmp(b)) {
// Iterate over the certificates for the round.
for (certificate_id, _, _) in certificates_for_round {
// Skip the certificate if it already exists in the ledger.
if self.ledger.contains_certificate(&certificate_id).unwrap_or(false) {
continue;
}

// Add the certificate to the pending certificates.
match certificates.get(&certificate_id).cloned() {
Some(certificate) => pending_certificates.insert(certificate),
None => continue,
};
}
}

pending_certificates
cfg_sorted_by!(rounds.clone(), |a, _, b, _| a.cmp(b))
.flat_map(|(_, certificates_for_round)| {
// Iterate over the certificates for the round.
cfg_into_iter!(certificates_for_round).filter_map(|(certificate_id, _, _)| {
// Skip the certificate if it already exists in the ledger.
if self.ledger.contains_certificate(&certificate_id).unwrap_or(false) {
None
} else {
// Add the certificate to the pending certificates.
certificates.get(&certificate_id).cloned()
}
})
})
.collect()
}

/// Checks the given `batch_header` for validity, returning the missing transmissions from storage.
Expand Down