a290a3c537
## Issue Addressed Successor to #2431 ## Proposed Changes * Add a `BlockReplayer` struct to abstract over the intricacies of calling `per_slot_processing` and `per_block_processing` while avoiding unnecessary tree hashing. * Add a variant of the forwards state root iterator that does not require an `end_state`. * Use the `BlockReplayer` when reconstructing states in the database. Use the efficient forwards iterator for frozen states. * Refactor the iterators to remove `Arc<HotColdDB>` (this seems to be neater than making _everything_ an `Arc<HotColdDB>` as I did in #2431). Supplying the state roots allow us to avoid building a tree hash cache at all when reconstructing historic states, which saves around 1 second flat (regardless of `slots-per-restore-point`). This is a small percentage of worst-case state load times with 200K validators and SPRP=2048 (~15s vs ~16s) but a significant speed-up for more frequent restore points: state loads with SPRP=32 should be now consistently <500ms instead of 1.5s (a ~3x speedup). ## Additional Info Required by https://github.com/sigp/lighthouse/pull/2628
124 lines
3.8 KiB
Rust
124 lines
3.8 KiB
Rust
use crate::chunked_vector::{chunk_key, Chunk, Field};
|
|
use crate::{HotColdDB, ItemStore};
|
|
use slog::error;
|
|
use types::{ChainSpec, EthSpec, Slot};
|
|
|
|
/// Iterator over the values of a `BeaconState` vector field (like `block_roots`).
|
|
///
|
|
/// Uses the freezer DB's separate table to load the values.
|
|
pub struct ChunkedVectorIter<'a, F, E, Hot, Cold>
|
|
where
|
|
F: Field<E>,
|
|
E: EthSpec,
|
|
Hot: ItemStore<E>,
|
|
Cold: ItemStore<E>,
|
|
{
|
|
pub(crate) store: &'a HotColdDB<E, Hot, Cold>,
|
|
current_vindex: usize,
|
|
pub(crate) end_vindex: usize,
|
|
next_cindex: usize,
|
|
current_chunk: Chunk<F::Value>,
|
|
}
|
|
|
|
impl<'a, F, E, Hot, Cold> ChunkedVectorIter<'a, F, E, Hot, Cold>
|
|
where
|
|
F: Field<E>,
|
|
E: EthSpec,
|
|
Hot: ItemStore<E>,
|
|
Cold: ItemStore<E>,
|
|
{
|
|
/// Create a new iterator which can yield elements from `start_vindex` up to the last
|
|
/// index stored by the restore point at `last_restore_point_slot`.
|
|
///
|
|
/// The `last_restore_point` slot should be the slot of a recent restore point as obtained from
|
|
/// `HotColdDB::get_latest_restore_point_slot`. We pass it as a parameter so that the caller can
|
|
/// maintain a stable view of the database (see `HybridForwardsBlockRootsIterator`).
|
|
pub fn new(
|
|
store: &'a HotColdDB<E, Hot, Cold>,
|
|
start_vindex: usize,
|
|
last_restore_point_slot: Slot,
|
|
spec: &ChainSpec,
|
|
) -> Self {
|
|
let (_, end_vindex) = F::start_and_end_vindex(last_restore_point_slot, spec);
|
|
|
|
// Set the next chunk to the one containing `start_vindex`.
|
|
let next_cindex = start_vindex / F::chunk_size();
|
|
// Set the current chunk to the empty chunk, it will never be read.
|
|
let current_chunk = Chunk::default();
|
|
|
|
Self {
|
|
store,
|
|
current_vindex: start_vindex,
|
|
end_vindex,
|
|
next_cindex,
|
|
current_chunk,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<'a, F, E, Hot, Cold> Iterator for ChunkedVectorIter<'a, F, E, Hot, Cold>
|
|
where
|
|
F: Field<E>,
|
|
E: EthSpec,
|
|
Hot: ItemStore<E>,
|
|
Cold: ItemStore<E>,
|
|
{
|
|
type Item = (usize, F::Value);
|
|
|
|
fn next(&mut self) -> Option<Self::Item> {
|
|
let chunk_size = F::chunk_size();
|
|
|
|
// Range exhausted, return `None` forever.
|
|
if self.current_vindex >= self.end_vindex {
|
|
None
|
|
}
|
|
// Value lies in the current chunk, return it.
|
|
else if self.current_vindex < self.next_cindex * chunk_size {
|
|
let vindex = self.current_vindex;
|
|
let val = self
|
|
.current_chunk
|
|
.values
|
|
.get(vindex % chunk_size)
|
|
.cloned()
|
|
.or_else(|| {
|
|
error!(
|
|
self.store.log,
|
|
"Missing chunk value in forwards iterator";
|
|
"vector index" => vindex
|
|
);
|
|
None
|
|
})?;
|
|
self.current_vindex += 1;
|
|
Some((vindex, val))
|
|
}
|
|
// Need to load the next chunk, load it and recurse back into the in-range case.
|
|
else {
|
|
self.current_chunk = Chunk::load(
|
|
&self.store.cold_db,
|
|
F::column(),
|
|
&chunk_key(self.next_cindex),
|
|
)
|
|
.map_err(|e| {
|
|
error!(
|
|
self.store.log,
|
|
"Database error in forwards iterator";
|
|
"chunk index" => self.next_cindex,
|
|
"error" => format!("{:?}", e)
|
|
);
|
|
e
|
|
})
|
|
.ok()?
|
|
.or_else(|| {
|
|
error!(
|
|
self.store.log,
|
|
"Missing chunk in forwards iterator";
|
|
"chunk index" => self.next_cindex
|
|
);
|
|
None
|
|
})?;
|
|
self.next_cindex += 1;
|
|
self.next()
|
|
}
|
|
}
|
|
}
|