Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
19 changes: 0 additions & 19 deletions .github/workflows/auto-reviewers.yml

This file was deleted.

5 changes: 0 additions & 5 deletions HzMemoryCache/Diagnostics/HzActivities.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,17 @@ public static class HzActivities

public static class Names
{
public const string SetRedis = "set to redis";
public const string Get = "get";
public const string GetRedis = "get from redis";
public const string GetOrSetCacheMiss = "get or set on cache miss";
public const string GetOrSetBatch = "get or set batch";
public const string GetBatchRedis = "get batch from redis";
public const string Remove = "remove";
public const string RemoveByPattern = "remove by pattern";
public const string RemoveRedis = "remove from redis";
public const string RemoveByPatternRedis = "remove by pattern from redis";
public const string RemoveItem = "remove item";
public const string Clear = "clear";
public const string ExecuteFactory = "execute factory";

public const string NotifyItemChange = "notify item change";
public const string Subscribe = "subscribe";
public const string ValueChanged = "value changed";
public const string EvictExpired = "evict expired";
public const string ProcessExpiredEviction = "process expired eviction";
Expand Down
9 changes: 1 addition & 8 deletions RedisBackedHzCache/RedisBackedHzCache.cs
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ public RedisBackedHzCache(RedisBackedHzCacheOptions options)
// Messages from other instances through redis.
redis.GetSubscriber().Subscribe(options.applicationCachePrefix, (_, message) =>
{
using var activity = HzActivities.Source.StartActivityWithCommonTags(HzActivities.Names.Subscribe, HzActivities.Area.RedisBackedHzCache);
var invalidationMessage = JsonSerializer.Deserialize<RedisInvalidationMessage>(message.ToString());
if (invalidationMessage.applicationCachePrefix != options.applicationCachePrefix)
{
Expand All @@ -141,7 +140,6 @@ public RedisBackedHzCache(RedisBackedHzCacheOptions options)

private void RedisRemove(string redisKey)
{
using var activity = HzActivities.Source.StartActivityWithCommonTags(HzActivities.Names.RemoveRedis, HzActivities.Area.Redis, key: redisKey);
redisDb.KeyDelete(redisKey);
}

Expand All @@ -153,9 +151,7 @@ private void RedisRemoveByPattern(string redisKey)

private void RedisSet(string redisKey, byte[] objectData, TTLValue ttlValue)
{
using var activity = HzActivities.Source.StartActivityWithCommonTags(HzActivities.Names.SetRedis, HzActivities.Area.Redis, key:redisKey);
redisDb.StringSet(redisKey, objectData,
TimeSpan.FromMilliseconds(ttlValue.absoluteExpireTime - DateTimeOffset.Now.ToUnixTimeMilliseconds()));
redisDb.StringSet(redisKey, objectData, TimeSpan.FromMilliseconds(ttlValue.absoluteExpireTime - DateTimeOffset.Now.ToUnixTimeMilliseconds()));
}

public void RemoveByPattern(string pattern, bool sendNotification = true)
Expand Down Expand Up @@ -205,7 +201,6 @@ public T Get<T>(string key)

private RedisValue GetRedisValue(string key)
{
using var activity = HzActivities.Source.StartActivityWithCommonTags(HzActivities.Names.GetRedis, HzActivities.Area.Redis, key: key);
return redisDb.StringGet(GetRedisKey(key));
}

Expand Down Expand Up @@ -277,8 +272,6 @@ public IList<T> GetOrSetBatch<T>(IList<string> keys, Func<IList<string>, List<Ke

private RedisValue[] RedisBatchResult<T>(RedisKey[] redisKeyList)
{
using var activity = HzActivities.Source.StartActivityWithCommonTags(HzActivities.Names.GetBatchRedis, HzActivities.Area.Redis);

return redisDb.StringGet(redisKeyList);
}

Expand Down
2 changes: 1 addition & 1 deletion RedisBackedHzCache/RedisBackedHzCache.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<ItemGroup>
<PackageReference Include="K4os.Compression.LZ4" Version="1.3.8" />
<PackageReference Include="StackExchange.Redis" Version="2.8.31" />
<PackageReference Include="StackExchange.Redis" Version="2.8.37" />
<PackageReference Include="Utf8Json" Version="1.3.7" />
</ItemGroup>

Expand Down
6 changes: 2 additions & 4 deletions RedisBackedHzCache/RedisBackedHzCacheAsync.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,9 @@ public async Task<T> GetAsync<T>(string key)
return value;
}

private async Task<RedisValue> GetRedisValueAsync(string key)
private Task<RedisValue> GetRedisValueAsync(string key)
{
using var activity = HzActivities.Source.StartActivityWithCommonTags(HzActivities.Names.GetRedis, HzActivities.Area.RedisBackedHzCache, async: true, key: key);
return await redisDb.StringGetAsync(GetRedisKey(key)).ConfigureAwait(false);
return redisDb.StringGetAsync(GetRedisKey(key));
}

public Task SetAsync<T>(string key, T value)
Expand Down Expand Up @@ -115,7 +114,6 @@ public async Task<IList<T>> GetOrSetBatchAsync<T>(IList<string> keys, Func<IList

private Task<RedisValue[]> RedisBatchResultAsync<T>(RedisKey[] redisKeyList)
{
using var activity = HzActivities.Source.StartActivityWithCommonTags(HzActivities.Names.GetBatchRedis, HzActivities.Area.Redis, async: true);
return redisDb.StringGetAsync(redisKeyList);
}

Expand Down
2 changes: 1 addition & 1 deletion RedisIDistributedCache/RedisIDistributedCache.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
<PackageReference Include="StackExchange.Redis" Version="2.8.31" />
<PackageReference Include="StackExchange.Redis" Version="2.8.37" />
<PackageReference Include="Utf8Json" Version="1.3.7" />
</ItemGroup>

Expand Down
Loading