8000 Bug/absolute expiration by alastairtree · Pull Request #125 · alastairtree/LazyCache · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Bug/absolute expiration #125

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
merged 2 commits into from
Sep 19, 2020
Merged

Bug/absolute expiration #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc3f8ab
tests: add tests for the many ways to SetAbsoluteExpiration (2 FAILS …
alastairtree Sep 19, 2020
823fc54
task: fix absolute expiration when set using timespans
alastairtree Sep 19, 2020
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
148 changes: 148 additions & 0 deletions LazyCache.UnitTests/CachingServiceMemoryCacheProviderTests.cs
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,154 @@ public void GetOrAddWithOffsetWillAddAndReturnCached()
Assert.AreEqual(2001, expectedSecond.Year);
}

[Test]
public void GetOrAddWithAbsoluteOffsetExpiryAsDateTimeOffsetDoesExpireItems()
{
var millisecondsCacheDuration = 100;
var validResult = sut.GetOrAdd(
TestKey,
() => new ComplexTestObject(),
DateTimeOffset.Now.AddMilliseconds(millisecondsCacheDuration)
);
// pass expiry time with a delay
Thread.Sleep(TimeSpan.FromMilliseconds(millisecondsCacheDuration + 50));
var expiredResult = sut.Get<ComplexTestObject>(TestKey);

Assert.That(validResult, Is.Not.Null);
Assert.That(expiredResult, Is.Null);
}

[Test]
public void GetOrAddWithAbsoluteOffsetExpiryAsTimeSpanDoesExpireItems()
{
var millisecondsCacheDuration = 100;
var validResult = sut.GetOrAdd(
TestKey,
() => new ComplexTestObject(),
TimeSpan.FromMilliseconds(millisecondsCacheDuration)
);
// pass expiry time with a delay
Thread.Sleep(TimeSpan.FromMilliseconds(millisecondsCacheDuration + 50));
var expiredResult = sut.Get<ComplexTestObject>(TestKey);

Assert.That(validResult, Is.Not.Null);
Assert.That(expiredResult, Is.Null);
}

[Test]
public void GetOrAddWithAbsoluteOffsetExpiryInTheDelegateDoesExpireItems()
{
var millisecondsCacheDuration = 100;
var validResult = sut.GetOrAdd(
TestKey,
entry =>
{
entry.SetAbsoluteExpiration(DateTimeOffset.Now.AddMilliseconds(millisecondsCacheDuration));
return new ComplexTestObject();
}
);
// pass expiry time with a delay
Thread.Sleep(TimeSpan.FromMilliseconds(millisecondsCacheDuration + 50));
var expiredResult = sut.Get<ComplexTestObject>(TestKey);

Assert.That(validResult, Is.Not.Null);
Assert.That(expiredResult, Is.Null);
}

[Test]
public void GetOrAddWithAbsoluteOffsetExpiryInTheDelegateUsingTimeSpanDoesExpireItems()
{
var millisecondsCacheDuration = 100;
var validResult = sut.GetOrAdd(
TestKey,
entry =>
{
entry.SetAbsoluteExpiration(TimeSpan.FromMilliseconds(millisecondsCacheDuration));
return new ComplexTestObject();
}
);
// pass expiry time with a delay
Thread.Sleep(TimeSpan.FromMilliseconds(millisecondsCacheDuration + 50));
var expiredResult = sut.Get<ComplexTestObject>(TestKey);

Assert.That(validResult, Is.Not.Null);
Assert.That(expiredResult, Is.Null);
}

[Test]
public async Task GetOrAddAsyncWithAbsoluteOffsetExpiryAsDateTimeOffsetDoesExpireItems()
{
var millisecondsCacheDuration = 100;
var validResult = await sut.GetOrAddAsync(
TestKey,
() => Task.FromResult(new ComplexTestObject()),
DateTimeOffset.Now.AddMilliseconds(millisecondsCacheDuration)
);
// pass expiry time with a delay
Thread.Sleep(TimeSpan.FromMilliseconds(millisecondsCacheDuration + 50));
var expiredResult = sut.Get<ComplexTestObject>(TestKey);

Assert.That(validResult, Is.Not.Null);
Assert.That(expiredResult, Is.Null);
}

[Test]
public async Task GetOrAddAsyncWithAbsoluteOffsetExpiryAsTimeSpanDoesExpireItems()
{
var millisecondsCacheDuration = 100;
var validResult = await sut.GetOrAddAsync(
TestKey,
() => Task.FromResult(new ComplexTestObject()),
TimeSpan.FromMilliseconds(millisecondsCacheDuration)
);
// pass expiry time with a delay
Thread.Sleep(TimeSpan.FromMilliseconds(millisecondsCacheDuration + 50));
var expiredResult = sut.Get<ComplexTestObject>(TestKey);

Assert.That(validResult, Is.Not.Null);
Assert.That(expiredResult, Is.Null);
}

[Test]
public async Task GetOrAddAsyncWithAbsoluteOffsetExpiryInTheDelegateDoesExpireItems()
{
var millisecondsCacheDuration = 100;
var validResult = await sut.GetOrAddAsync(
TestKey,
entry =>
{
entry.SetAbsoluteExpiration(DateTimeOffset.Now.AddMilliseconds(millisecondsCacheDuration));
return Task.FromResult(new ComplexTestObject());
}
);
// pass expiry time with a delay
Thread.Sleep(TimeSpan.FromMilliseconds(millisecondsCacheDuration + 50));
var expiredResult = sut.Get<ComplexTestObject>(TestKey);

Assert.That(validResult, Is.Not.Null);
Assert.That(expiredResult, Is.Null);
}

[Test]
public async Task GetOrAddAsyncWithAbsoluteOffsetExpiryInTheDelegateUsingTimeSpanDoesExpireItems()
{
var millisecondsCacheDuration = 100;
var validResult = await sut.GetOrAddAsync(
TestKey,
entry =>
{
entry.SetAbsoluteExpiration(TimeSpan.FromMilliseconds(millisecondsCacheDuration));
return Task.FromResult(new ComplexTestObject());
}
);
// pass expiry time with a delay
Thread.Sleep(TimeSpan.FromMilliseconds(millisecondsCacheDuration + 50));
var expiredResult = sut.Get<ComplexTestObject>(TestKey);

Assert.That(validResult, Is.Not.Null);
Assert.That(expiredResult, Is.Null);
}

[Test]
public void GetOrAddWithPolicyAndThenGetObjectReturnsCorrectType()
{
Expand Down
11 changes: 11 additions & 0 deletions LazyCache/CachingService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ object CacheFactory(ICacheEntry entry) =>
new Lazy<T>(() =>
{
var result = addItemFactory(entry);
SetAbsoluteExpirationFromRelative(entry);
EnsureEvictionCallbackDoesNotReturnTheAsyncOrLazy<T>(entry.PostEvictionCallbacks);
return result;
});
Expand Down Expand Up @@ -136,6 +137,15 @@ object CacheFactory(ICacheEntry entry) =>
}
}

private static void SetAbsoluteExpirationFromRelative(ICacheEntry entry)
{
if (!entry.AbsoluteExpirationRelativeToNow.HasValue) return;

var absoluteExpiration = DateTimeOffset.UtcNow + entry.AbsoluteExpirationRelativeToNow.Value;
if (!entry.AbsoluteExpiration.HasValue || absoluteExpiration < entry.AbsoluteExpiration)
entry.AbsoluteExpiration = absoluteExpiration;
}

public virtual void Remove(string key)
{
ValidateKey(key);
Expand Down Expand Up @@ -163,6 +173,7 @@ object CacheFactory(ICacheEntry entry) =>
new AsyncLazy<T>(() =>
{
var result = addItemFactory(entry);
SetAbsoluteExpirationFromRelative(entry);
EnsureEvictionCallbackDoesNotReturnTheAsyncOrLazy<T>(entry.PostEvictionCallbacks);
return result;
});
Expand Down
4 changes: 4 additions & 0 deletions ReleaseNotes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Release notes for LazyCache #

## Version 2.0.5
- Fix #85 and #100 Absolute expiration not working with TimeSpan. Thank you to @Meberem and @Sinhk.
- Fix #124 casing for PackageReference - by @jnyrup

## Version 2.0.4
- Fix #82 Make constructor resolution specific when using aspnet core dependency injection

Expand Down
0