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

feat: add HeadersTD static file segment #6118

Merged
merged 2 commits into from
Jan 18, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 2 additions & 0 deletions bin/reth/src/commands/db/snapshots/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ impl Command {
factory.clone(),
snap_segments::Receipts::new(*compression, filters),
)?,
SnapshotSegment::HeadersTD => todo!(),
}
}
}
Expand Down Expand Up @@ -145,6 +146,7 @@ impl Command {
InclusionFilter::Cuckoo,
phf,
)?,
SnapshotSegment::HeadersTD => todo!(),
}
}
}
Expand Down
5 changes: 5 additions & 0 deletions crates/primitives/src/snapshot/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ pub struct HighestSnapshots {
/// Highest snapshotted block of headers, inclusive.
/// If [`None`], no snapshot is available.
pub headers: Option<BlockNumber>,
/// Highest snapshotted block of headers total difficulty, inclusive.
/// If [`None`], no snapshot is available.
pub headers_td: Option<BlockNumber>,
/// Highest snapshotted block of receipts, inclusive.
/// If [`None`], no snapshot is available.
pub receipts: Option<BlockNumber>,
Expand All @@ -31,6 +34,7 @@ impl HighestSnapshots {
pub fn highest(&self, segment: SnapshotSegment) -> Option<BlockNumber> {
match segment {
SnapshotSegment::Headers => self.headers,
SnapshotSegment::HeadersTD => self.headers_td,
SnapshotSegment::Transactions => self.transactions,
SnapshotSegment::Receipts => self.receipts,
}
Expand All @@ -40,6 +44,7 @@ impl HighestSnapshots {
pub fn as_mut(&mut self, segment: SnapshotSegment) -> &mut Option<BlockNumber> {
match segment {
SnapshotSegment::Headers => &mut self.headers,
SnapshotSegment::HeadersTD => &mut self.headers_td,
SnapshotSegment::Transactions => &mut self.transactions,
SnapshotSegment::Receipts => &mut self.receipts,
}
Expand Down
6 changes: 5 additions & 1 deletion crates/primitives/src/snapshot/segment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ pub enum SnapshotSegment {
#[strum(serialize = "headers")]
/// Snapshot segment responsible for the `CanonicalHeaders`, `Headers`, `HeaderTD` tables.
onbjerg marked this conversation as resolved.
Show resolved Hide resolved
Headers,
#[strum(serialize = "headerstd")]
/// Snapshot segment responsible for the `HeaderTD` tables.
HeadersTD,
#[strum(serialize = "transactions")]
/// Snapshot segment responsible for the `Transactions` table.
Transactions,
Expand All @@ -50,6 +53,7 @@ impl SnapshotSegment {

match self {
SnapshotSegment::Headers => default_config,
SnapshotSegment::HeadersTD => default_config,
SnapshotSegment::Transactions => default_config,
SnapshotSegment::Receipts => default_config,
}
Expand Down Expand Up @@ -182,7 +186,7 @@ impl SegmentHeader {
/// Returns the row offset which depends on whether the segment is block or transaction based.
pub fn start(&self) -> u64 {
match self.segment {
SnapshotSegment::Headers => self.block_start(),
SnapshotSegment::Headers | SnapshotSegment::HeadersTD => self.block_start(),
SnapshotSegment::Transactions | SnapshotSegment::Receipts => self.tx_start(),
}
}
Expand Down
8 changes: 6 additions & 2 deletions crates/storage/provider/src/providers/database/provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,9 @@ impl<TX: DbTx> DatabaseProvider<TX> {
if let Some(snapshot_provider) = &self.snapshot_provider {
// If there is, check the maximum block or transaction number of the segment.
if let Some(snapshot_upper_bound) = match segment {
SnapshotSegment::Headers => snapshot_provider.get_highest_snapshot_block(segment),
SnapshotSegment::Headers | SnapshotSegment::HeadersTD => {
snapshot_provider.get_highest_snapshot_block(segment)
}
SnapshotSegment::Transactions | SnapshotSegment::Receipts => {
snapshot_provider.get_highest_snapshot_tx(segment)
}
Expand Down Expand Up @@ -321,7 +323,9 @@ impl<TX: DbTx> DatabaseProvider<TX> {
if let Some(provider) = &self.snapshot_provider {
// If there is, check the maximum block or transaction number of the segment.
let snapshot_upper_bound = match segment {
SnapshotSegment::Headers => provider.get_highest_snapshot_block(segment),
SnapshotSegment::Headers | SnapshotSegment::HeadersTD => {
provider.get_highest_snapshot_block(segment)
}
SnapshotSegment::Transactions | SnapshotSegment::Receipts => {
provider.get_highest_snapshot_tx(segment)
}
Expand Down
4 changes: 3 additions & 1 deletion crates/storage/provider/src/providers/snapshot/manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,9 @@ impl SnapshotProvider {
P: FnMut(&T) -> bool,
{
let get_provider = |start: u64| match segment {
SnapshotSegment::Headers => self.get_segment_provider_from_block(segment, start, None),
SnapshotSegment::Headers | SnapshotSegment::HeadersTD => {
self.get_segment_provider_from_block(segment, start, None)
}
SnapshotSegment::Transactions | SnapshotSegment::Receipts => {
self.get_segment_provider_from_transaction(segment, start, None)
}
Expand Down