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

Jump to bottom

Fix misleading comment #7105

Merged
merged 2 commits into from Mar 11, 2024
Merged

Fix misleading comment #7105

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c02eb9
Fix misleading comment
emhane Mar 11, 2024
f19da0e
Fix lint
emhane Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions crates/prune/src/segments/history.rs
View file
Open in desktop
Expand Up @@ -53,15 +53,15 @@ where
// filter it. It is guaranteed that further shards for this sharded key will not
// contain the target block number, as it's in this shard.
else {
let new_blocks =
let higher_blocks =
blocks.iter().skip_while(|block| *block <= to_block).collect::<Vec<_>>();

// If there were blocks less than or equal to the target one
// (so the shard has changed), update the shard.
if blocks.len() as usize != new_blocks.len() {
// If there are no more blocks in this shard, we need to remove it, as empty
// shards are not allowed.
if new_blocks.is_empty() {
if blocks.len() as usize != higher_blocks.len() {
// If there will be no more blocks in the shard after pruning blocks below target
// block, we need to remove it, as empty shards are not allowed.
if higher_blocks.is_empty() {
if key.as_ref().highest_block_number == u64::MAX {
let prev_row = cursor.prev()?;
match prev_row {
Expand Down Expand Up @@ -95,7 +95,7 @@ where
deleted += 1;
}
} else {
cursor.upsert(key.clone(), BlockNumberList::new_pre_sorted(new_blocks))?;
cursor.upsert(key.clone(), BlockNumberList::new_pre_sorted(higher_blocks))?;
}
}

Expand Down