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
8 changes: 4 additions & 4 deletions HzMemoryCache/HzCacheMemoryLocker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ private SemaphoreSlim GetSemaphore(string cacheName, string cacheInstanceId, str
public async ValueTask<object> AcquireLockAsync(string cacheName, string cacheInstanceId, string operationId, string key, TimeSpan timeout, ILogger? logger,
CancellationToken token)
{
using var activity = HzActivities.Source.StartActivityWithCommonTags(HzActivities.Names.AcquireLock, HzActivities.Area.HzCacheMemoryLocker, key: key);
using var activity = HzActivities.Source.StartActivityWithCommonTags(HzActivities.Names.AcquireLock, HzActivities.Area.HzCacheMemoryLocker, key: key, async: true);
var semaphore = GetSemaphore(cacheName, cacheInstanceId, key, logger);

if (logger?.IsEnabled(LogLevel.Trace) ?? false)
Expand All @@ -91,7 +91,8 @@ public async ValueTask<object> AcquireLockAsync(string cacheName, string cacheIn
cacheInstanceId, operationId, key);
}
var acquired = false;
using (var waitForSemaphore = HzActivities.Source.StartActivityWithCommonTags(HzActivities.Names.WaitForSemaphore, HzActivities.Area.HzCacheMemoryLocker, key: key)){
using (var waitForSemaphore = HzActivities.Source.StartActivityWithCommonTags(HzActivities.Names.WaitForSemaphore, HzActivities.Area.HzCacheMemoryLocker, key: key, async: true))
{
acquired = await semaphore.WaitAsync(timeout, token).ConfigureAwait(false);
}

Expand Down Expand Up @@ -135,7 +136,6 @@ public async ValueTask<object> AcquireLockAsync(string cacheName, string cacheIn
HzActivities.Source.StartActivityWithCommonTags(HzActivities.Names.WaitForSemaphore,
HzActivities.Area.HzCacheMemoryLocker, key: key))
{

acquired = semaphore.Wait(timeout, token);
}

Expand Down Expand Up @@ -188,4 +188,4 @@ public void ReleaseLock(string cacheName, string cacheInstanceId, string operati
}
}
}
}
}
9 changes: 4 additions & 5 deletions HzMemoryCache/HzMemoryCacheAsync.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public Task SetAsync<T>(string key, T? value, TimeSpan ttl)

using (var executeActivity =
HzActivities.Source.StartActivityWithCommonTags(HzActivities.Names.ExecuteFactory,
HzActivities.Area.HzMemoryCache,async:true, key: key))
HzActivities.Area.HzMemoryCache, async: true, key: key))
{
value = await valueFactory(key).ConfigureAwait(false);
}
Expand All @@ -71,7 +71,6 @@ public Task SetAsync<T>(string key, T? value, TimeSpan ttl)
return value;
}


public async Task<IList<T>> GetOrSetBatchAsync<T>(IList<string> keys, Func<IList<string>, Task<List<KeyValuePair<string, T>>>> valueFactory)
{
return await GetOrSetBatchAsync(keys, valueFactory, options.defaultTTL).ConfigureAwait(false);
Expand All @@ -86,7 +85,7 @@ public async Task<IList<T>> GetOrSetBatchAsync<T>(IList<string> keys, Func<IList
Dictionary<string, T> factoryRetrievedItems;
using (var executeActivity =
HzActivities.Source.StartActivityWithCommonTags(HzActivities.Names.ExecuteFactory,
HzActivities.Area.HzMemoryCache, key: string.Join(",", missingKeys ?? new List<string>())))
HzActivities.Area.HzMemoryCache, key: string.Join(",", missingKeys ?? new List<string>()), async: true))
{
factoryRetrievedItems =
(await valueFactory(missingKeys).ConfigureAwait(false)).ToDictionary(kv => kv.Key, kv => kv.Value);
Expand Down Expand Up @@ -129,7 +128,7 @@ public async Task<bool> RemoveAsync(string key)

public async Task RemoveByPatternAsync(string pattern, bool sendNotification = true)
{
using var activity = HzActivities.Source.StartActivityWithCommonTags(HzActivities.Names.RemoveByPattern, HzActivities.Area.HzMemoryCache, async: true, pattern: pattern,sendNotification:sendNotification);
using var activity = HzActivities.Source.StartActivityWithCommonTags(HzActivities.Names.RemoveByPattern, HzActivities.Area.HzMemoryCache, async: true, pattern: pattern, sendNotification: sendNotification);
var myPattern = pattern;
if (pattern[0] != '*')
{
Expand Down Expand Up @@ -202,4 +201,4 @@ private async Task<bool> RemoveItemAsync(string key, CacheItemChangeType changeT
return result;
}
}
}
}
Loading