Skip to content

Change redis commandFlags to None #40

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 1 commit into from
Jul 9, 2019
Merged

Change redis commandFlags to None #40

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
40 changes: 0 additions & 40 deletions RedisCaching.UnitTests/RedisCacheTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,46 +300,6 @@ public void TestRedisCacheTimeToLive_Sliding()
Assert.AreNotEqual("1", result);
}

[TestMethod]
public void TestRedisCacheTimeToLive_Constant()
{
var ttl = 10;
int misses = 0;
string result;
var stopwatch = new Stopwatch();
Func<string> getter = () => { misses++; return misses.ToString(); };

var expireAt = DateTime.Now.AddSeconds(ttl);
stopwatch.Start();

var cache = new RedisCache(
"constant-expire",
new RedisCachePolicy
{
ConnectionString = connectionString,
AbsoluteExpiration = expireAt,
});
cache.ClearAll();

result = cache.Get("key", getter);
DateTime insertTime = DateTime.Now;
Assert.AreEqual(1, misses);
Assert.AreEqual("1", result);

result = cache.Get("key", getter);
Assert.AreEqual(1, misses);
Assert.AreEqual("1", result);

CacheTestTools.AssertValueDoesntChangeWithin(cache, "key", "1", getter, stopwatch, ttl - 1);

// Should expire within TTL+60sec from insert
CacheTestTools.AssertValueDoesChangeWithin(cache, "key", "1", getter, stopwatch, 60.1);

result = cache.Get("key", getter);
Assert.AreNotEqual(1, misses);
Assert.AreNotEqual("1", result);
}

[TestMethod]
public void TestRedisCacheGetTwice()
{
Expand Down
16 changes: 8 additions & 8 deletions RedisCaching/CacheContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ internal void SetItem<TValue>(CacheItem<TValue> cacheItem)
if (cacheItem.ExpireIn.HasValue)
expiry = cacheItem.ExpireIn;

client.Database.StringSet(cacheItem.Id, convert.ToRedis(cacheItem), expiry, When.Always, CommandFlags.FireAndForget);
client.Database.StringSet(cacheItem.Id, convert.ToRedis(cacheItem), expiry, When.Always, CommandFlags.None);
}

internal Task SetItemAsync<TValue>(CacheItem<TValue> cacheItem)
Expand All @@ -47,7 +47,7 @@ internal Task SetItemAsync<TValue>(CacheItem<TValue> cacheItem)
expiry = cacheItem.ExpireIn;

return client.Database
.StringSetAsync(cacheItem.Id, convert.ToRedis(cacheItem), expiry, When.Always, CommandFlags.FireAndForget);
.StringSetAsync(cacheItem.Id, convert.ToRedis(cacheItem), expiry, When.Always, CommandFlags.None);
}

internal bool SetIfNotExists<TValue>(CacheItem<TValue> cacheItem)
Expand Down Expand Up @@ -100,38 +100,38 @@ internal void ExpireItemIn<TValue>(String cacheName, String key, TimeSpan timeSp

private void ExpireById(string id, TimeSpan timeSpan)
{
client.Database.KeyExpire(id, timeSpan, CommandFlags.FireAndForget);
client.Database.KeyExpire(id, timeSpan, CommandFlags.None);
}

private Task ExpireByIdAsync(string id, TimeSpan timeSpan)
{
return client.Database.KeyExpireAsync(id, timeSpan, CommandFlags.FireAndForget);
return client.Database.KeyExpireAsync(id, timeSpan, CommandFlags.None);
}

internal void RemoveItem(String cacheName, String key)
{
var id = CacheItem<object>.GetId(cacheName, key);
client.Database.KeyDelete(id, CommandFlags.FireAndForget);
client.Database.KeyDelete(id, CommandFlags.None);
}

internal Task RemoveItemAsync(String cacheName, String key)
{
var id = CacheItem<object>.GetId(cacheName, key);
return client.Database.KeyDeleteAsync(id, CommandFlags.FireAndForget);
return client.Database.KeyDeleteAsync(id, CommandFlags.None);
}

internal void ClearItems(String cacheName)
{
var keyPrefix = CacheItem<object>.GetId(cacheName, string.Empty);
var keys = client.MasterServer.Keys(0, string.Format("*{0}*", keyPrefix), 1000, CommandFlags.None).ToArray();
client.Database.KeyDelete(keys, CommandFlags.FireAndForget);
client.Database.KeyDelete(keys, CommandFlags.None);
}

internal Task ClearItemsAsync(String cacheName)
{
var keyPrefix = CacheItem<object>.GetId(cacheName, string.Empty);
var keys = client.MasterServer.Keys(0, string.Format("*{0}*", keyPrefix), 1000, CommandFlags.None).ToArray();
return client.Database.KeyDeleteAsync(keys, CommandFlags.FireAndForget);
return client.Database.KeyDeleteAsync(keys, CommandFlags.None);
}

public void Dispose()
Expand Down
6 changes: 3 additions & 3 deletions RedisCaching/RedisCaching.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AssemblyName>PubComp.Caching.RedisCaching</AssemblyName>
<RootNamespace>PubComp.Caching.RedisCaching</RootNamespace>
<Version>4.1.1</Version>
<AssemblyVersion>4.1.1.0</AssemblyVersion>
<FileVersion>4.1.1.0</FileVersion>
<Version>4.1.2</Version>
<!--Only change AssemblyVersion for major versions!--><AssemblyVersion>4.1.1.0</AssemblyVersion>
<FileVersion>4.1.2.0</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<NoWarn>1701;1702;1591</NoWarn>
Expand Down