Skip to content
Merged
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
45 changes: 44 additions & 1 deletion crates/prune/prune/src/limiter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ impl PruneLimiter {

/// Returns the number of deleted entries left before the limit is reached.
pub fn deleted_entries_limit_left(&self) -> Option<usize> {
self.deleted_entries_limit.as_ref().map(|limit| limit.limit - limit.deleted)
self.deleted_entries_limit.as_ref().map(|limit| limit.limit.saturating_sub(limit.deleted))
}

/// Returns the limit on the number of deleted entries (rows in the database).
Expand Down Expand Up @@ -411,4 +411,47 @@ mod tests {
sleep(Duration::new(0, 10_000_000)); // 10 milliseconds
assert!(limiter.is_limit_reached(), "Limit should be reached when time limit is reached");
}

#[test]
fn test_deleted_entries_limit_left_saturates_when_overrun() {
let mut limiter = PruneLimiter::default().set_deleted_entries_limit(10);
// Delete more than the limit
limiter.increment_deleted_entries_count_by(12);
// Remaining should saturate to 0 (no underflow/panic)
assert_eq!(limiter.deleted_entries_limit_left(), Some(0));
}

#[test]
fn test_deleted_entries_limit_left_zero_when_equal() {
let mut limiter = PruneLimiter::default().set_deleted_entries_limit(3);
limiter.increment_deleted_entries_count_by(3);
assert_eq!(limiter.deleted_entries_limit_left(), Some(0));
}

#[test]
fn test_deleted_entries_limit_left_after_lowering_limit_with_set() {
// Start with higher limit and some deletions
let mut limiter = PruneLimiter::default().set_deleted_entries_limit(20);
limiter.increment_deleted_entries_count_by(15);
assert_eq!(limiter.deleted_entries_limit_left(), Some(5));

// Lower the limit below the current deleted count
limiter = limiter.set_deleted_entries_limit(10);
// Remaining should saturate to 0
assert_eq!(limiter.deleted_entries_limit_left(), Some(0));
}

#[test]
fn test_deleted_entries_limit_left_after_lowering_limit_with_floor() {
// Start with limit 15 and delete 14
let mut limiter = PruneLimiter::default().set_deleted_entries_limit(15);
limiter.increment_deleted_entries_count_by(14);

// Floor to the largest multiple of 8 <= 15, which is 8
let denominator = NonZeroUsize::new(8).unwrap();
let limiter = limiter.floor_deleted_entries_limit_to_multiple_of(denominator);

// Since deleted (14) > new limit (8), remaining should be 0 (saturating)
assert_eq!(limiter.deleted_entries_limit_left(), Some(0));
}
}