Skip to content

lru: fix expiry when updating #82

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

Merged
sergiosalvatore merged 1 commit into from
Feb 10, 2026
Merged

lru: fix expiry when updating #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions lru/lru_with_expiry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,20 @@ func TestTypedGetWithExpiry(t *testing.T) {
{name: "string_hit_expiring_big_jump", keyToAdd: "myKey", keyToGet: "myKey", keyExpiry: startTime.Add(time.Hour), setTime: startTime.Add(time.Hour * 24 * 365), expectedOK: false},
{name: "string_hit_expiring_exact_jump", keyToAdd: "myKey", keyToGet: "myKey", keyExpiry: startTime.Add(time.Hour), setTime: startTime.Add(time.Hour), expectedOK: false},
{name: "string_hit_expiring_jump_just_under", keyToAdd: "myKey", keyToGet: "myKey", keyExpiry: startTime.Add(time.Hour), setTime: startTime.Add(time.Hour - time.Nanosecond), expectedOK: true},
{name: "string_hit_zero_val_no_advance_prior_entry", keyToAdd: "fizzlebat", keyToGet: "fizzlebat", setTime: startTime, expectedOK: true},
{name: "string_hit_zero_val_big_jump_prior_entry", keyToAdd: "fizzlebat", keyToGet: "fizzlebat", setTime: startTime.Add(time.Hour * 24 * 365), expectedOK: true},
{name: "string_hit_expiring_big_jump_prior_entry", keyToAdd: "fizzlebat", keyToGet: "fizzlebat", keyExpiry: startTime.Add(time.Hour), setTime: startTime.Add(time.Hour * 24 * 365), expectedOK: false},
{name: "string_hit_expiring_exact_jump_prior_entry", keyToAdd: "fizzlebat", keyToGet: "fizzlebat", keyExpiry: startTime.Add(time.Hour), setTime: startTime.Add(time.Hour), expectedOK: false},
{name: "string_hit_expiring_jump_just_under_prior_entry", keyToAdd: "fizzlebat", keyToGet: "fizzlebat", keyExpiry: startTime.Add(time.Hour), setTime: startTime.Add(time.Hour - time.Nanosecond), expectedOK: true},
}

for _, tt := range getTests {
t.Run(tt.name, func(t *testing.T) {
clk := fake.NewClock(startTime)
lru := TypedNew[string, int](0)
lru.Clock = clk
// add a pre-existing value that we can update with a different expiry
lru.AddExpiring("fizzlebat", 4321, startTime.Add(time.Minute))
lru.AddExpiring(tt.keyToAdd, 1234, tt.keyExpiry)

clk.SetClock(tt.setTime)
Expand Down
11 changes: 11 additions & 0 deletions lru/typed_lru.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,19 @@ func (c *TypedCache[K, V]) AddExpiring(key K, value V, expiration time.Time) {
if ele, hit := c.cache[key]; hit {
c.ll.MoveToFront(ele)
ele.value.value = value
// Remove the existing expiration handle from the heap before (possibly) adding a new one.
// this way we don't end up with both expirations in the heap.
if ele.value.hasExpiry {
c.expirations.Remove(ele.value.expHandle)
}
if !expiration.IsZero() {
ele.value.expHandle = c.expirations.Push(expiration, weak.Make(ele))
ele.value.hasExpiry = true
ele.value.expiry = expiration.Sub(c.expiryBase)
} else {
ele.value.expHandle = nil
ele.value.hasExpiry = false
ele.value.expiry = 0
}
return
}
Expand Down