Skip to content

Improve Disk and Redis #286

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

Merged
merged 3 commits into from
Feb 12, 2021
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
Next Next commit
fixed disk provider tryset after expired (#280)
  • Loading branch information
catcherwong committed Jan 30, 2021
commit 41791d3afe8694df8f7e35a00b0bd5f7d14af98f
2 changes: 1 addition & 1 deletion src/EasyCaching.Disk/DefaultDiskCachingProvider.Async.cs
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ public override async Task<bool> BaseTrySetAsync<T>(string cacheKey, T cacheValu

var bytes = BuildDiskCacheValue(cacheValue, expiration);

using (FileStream stream = new FileStream(path, FileMode.CreateNew, FileAccess.Write, FileShare.None))
using (FileStream stream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.Write, FileShare.None))
{
await stream.WriteAsync(bytes, 0, bytes.Length);
AppendKey(cacheKey, fileName);
Expand Down
2 changes: 1 addition & 1 deletion src/EasyCaching.Disk/DefaultDiskCachingProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ public override bool BaseTrySet<T>(string cacheKey, T cacheValue, TimeSpan expir

var bytes = BuildDiskCacheValue(cacheValue, expiration);

using (FileStream stream = new FileStream(path, FileMode.CreateNew, FileAccess.Write, FileShare.None))
using (FileStream stream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.Write, FileShare.None))
{
stream.Write(bytes, 0, bytes.Length);
AppendKey(cacheKey, fileName);
Expand Down
42 changes: 42 additions & 0 deletions test/EasyCaching.UnitTests/CachingTests/DiskCachingProviderTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,47 @@ protected override Task GetAsync_Parallel_Should_Succeed()
{
return Task.CompletedTask;
}

[Fact]
public async Task TrySetAgainAsync_After_Expired_Should_Succed()
{
var key = Guid.NewGuid().ToString();
var v1 = "123456";
var res1 = await _provider.TrySetAsync<string>(key, v1, TimeSpan.FromSeconds(1));
Assert.True(res1);

await Task.Delay(TimeSpan.FromSeconds(2));
var res2 = await _provider.TrySetAsync<string>(key, v1, TimeSpan.FromSeconds(5));
Assert.True(res2);
}

[Fact]
public void TrySetAgain_After_Expired_Should_Succed()
{
var key = Guid.NewGuid().ToString();
var v1 = "123456";
var res1 = _provider.TrySet<string>(key, v1, TimeSpan.FromSeconds(1));
Assert.True(res1);

System.Threading.Thread.Sleep(TimeSpan.FromSeconds(2));
var res2 = _provider.TrySet<string>(key, v1, TimeSpan.FromSeconds(5));
Assert.True(res2);
}

[Fact]
public void Set_Diff_Len_Value_Should_Succed()
{
var key = Guid.NewGuid().ToString();
var v1 = "1234567890";
var v2 = "12345";

_provider.Set<string>(key, v1, TimeSpan.FromSeconds(15));
var res1 = _provider.Get<string>(key);
Assert.Equal(v1, res1.Value);

_provider.Set<string>(key, v2, TimeSpan.FromSeconds(15));
var res2 = _provider.Get<string>(key);
Assert.Equal(v2, res2.Value);
}
}
}