Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Issue MemoryCacheExtensions #233
Krzysztof Pajak5a389b1f3efa
diff --git a/src/Core/Grand.Infrastructure/Caching/CacheEntryExtensions.cs b/src/Core/Grand.Infrastructure/Caching/CacheEntryExtensions.csnew file mode 100644index 000000000..3e8440593--- /dev/null+++ b/src/Core/Grand.Infrastructure/Caching/CacheEntryExtensions.cs@@ -0,0 +1,18 @@+using Microsoft.Extensions.Caching.Memory;+using System.Collections.Concurrent;++namespace Grand.Infrastructure.Caching+{+ public static class CacheEntryExtensions+ {+ public static ICacheEntry SetKey(this ICacheEntry entry, ConcurrentDictionary<string, ICacheEntry> _cacheEntries)+ {+ _cacheEntries.AddOrUpdate(entry.Key.ToString(), entry, (o, cacheEntry) =>+ {+ cacheEntry.Value = entry;+ return cacheEntry;+ });+ return entry;+ }+ }+}diff --git a/src/Core/Grand.Infrastructure/Caching/ICacheBase.cs b/src/Core/Grand.Infrastructure/Caching/ICacheBase.csindex 466150482..18c2f0ee5 100644--- a/src/Core/Grand.Infrastructure/Caching/ICacheBase.cs+++ b/src/Core/Grand.Infrastructure/Caching/ICacheBase.cs@@ -8,8 +8,7 @@ namespace Grand.Infrastructure.CachingTask<T> GetAsync<T>(string key, Func<Task<T>> acquire);Task<T> GetAsync<T>(string key, Func<Task<T>> acquire, int cacheTime);T Get<T>(string key, Func<T> acquire);- T Get<T>(string key, Func<T> acquire, int cacheTime);- Task SetAsync(string key, object data, int cacheTime);+ T Get<T>(string key, Func<T> acquire, int cacheTime);Task RemoveAsync(string key, bool publisher = true);Task RemoveByPrefix(string prefix, bool publisher = true);Task Clear(bool publisher = true);diff --git a/src/Core/Grand.Infrastructure/Caching/MemoryCacheBase.cs b/src/Core/Grand.Infrastructure/Caching/MemoryCacheBase.csindex fbbebdc12..9621a5542 100644--- a/src/Core/Grand.Infrastructure/Caching/MemoryCacheBase.cs+++ b/src/Core/Grand.Infrastructure/Caching/MemoryCacheBase.cs@@ -3,6 +3,7 @@ using Grand.SharedKernel.Extensions;using MediatR;using Microsoft.Extensions.Caching.Memory;using Microsoft.Extensions.Primitives;+using System.Collections.Concurrent;namespace Grand.Infrastructure.Caching{@@ -17,7 +18,9 @@ namespace Grand.Infrastructure.Cachingprivate readonly IMediator _mediator;private bool _disposed;- private static CancellationTokenSource _resetCacheToken = new CancellationTokenSource();+ private static CancellationTokenSource _resetCacheToken = new();++ protected readonly ConcurrentDictionary<string, ICacheEntry> _cacheEntries = new();#endregion@@ -43,6 +46,7 @@ namespace Grand.Infrastructure.Cachingreturn await _cache.GetOrCreateAsync(key, entry =>{entry.SetOptions(GetMemoryCacheEntryOptions(cacheTime));+ entry.SetKey(_cacheEntries);return acquire();});}@@ -57,21 +61,15 @@ namespace Grand.Infrastructure.Cachingreturn _cache.GetOrCreate(key, entry =>{entry.SetOptions(GetMemoryCacheEntryOptions(cacheTime));+ entry.SetKey(_cacheEntries);return acquire();});- }- public virtual Task SetAsync(string key, object data, int cacheTime)- {- if (data != null)- {- _cache.Set(key, data, GetMemoryCacheEntryOptions(cacheTime));- }- return Task.CompletedTask;- }+ }public virtual Task RemoveAsync(string key, bool publisher = true){_cache.Remove(key);+if (publisher)_mediator.Publish(new EntityCacheEvent(key, CacheEvent.RemoveKey));@@ -80,10 +78,10 @@ namespace Grand.Infrastructure.Cachingpublic virtual Task RemoveByPrefix(string prefix, bool publisher = true){- var keysToRemove = _cache.GetKeys<string>().Where(x => x.ToString().StartsWith(prefix, StringComparison.OrdinalIgnoreCase));- foreach (var key in keysToRemove)+ var entriesToRemove = _cacheEntries.Where(x => x.Key.StartsWith(prefix, StringComparison.OrdinalIgnoreCase));+ foreach (var cacheEntrie in entriesToRemove){- _cache.Remove(key);+ _cache.Remove(cacheEntrie.Key);}if (publisher)@@ -94,6 +92,10 @@ namespace Grand.Infrastructure.Cachingpublic virtual Task Clear(bool publisher = true){+ //clear keys+ foreach (var cacheEntry in _cacheEntries.Keys.ToList())+ _cache.Remove(cacheEntry);+//cancel_resetCacheToken.Cancel();//dispose@@ -142,11 +144,9 @@ namespace Grand.Infrastructure.Cachingprivate void PostEvictionCallback(object key, object value, EvictionReason reason, object state){- if (reason == EvictionReason.Replaced)- return;-- if (reason == EvictionReason.TokenExpired)- return;+ if (reason != EvictionReason.Replaced)+ _cacheEntries.TryRemove(key.ToString(), out var _);+}#endregiondiff --git a/src/Core/Grand.Infrastructure/Caching/MemoryCacheExtensions.cs b/src/Core/Grand.Infrastructure/Caching/MemoryCacheExtensions.csdeleted file mode 100644index 6c757f5a7..000000000--- a/src/Core/Grand.Infrastructure/Caching/MemoryCacheExtensions.cs+++ /dev/null@@ -1,20 +0,0 @@-using Microsoft.Extensions.Caching.Memory;-using System.Collections;-using System.Reflection;--namespace Grand.Infrastructure.Caching-{- public static class MemoryCacheExtensions- {- private static readonly Func<MemoryCache, object> GetEntriesCollection = Delegate.CreateDelegate(- typeof(Func<MemoryCache, object>),- typeof(MemoryCache).GetProperty("EntriesCollection", BindingFlags.NonPublic | BindingFlags.Instance).GetGetMethod(true),- throwOnBindFailure: true) as Func<MemoryCache, object>;-- public static IEnumerable GetKeys(this IMemoryCache memoryCache) =>- ((IDictionary)GetEntriesCollection((MemoryCache)memoryCache)).Keys;-- public static IEnumerable<T> GetKeys<T>(this IMemoryCache memoryCache) =>- GetKeys(memoryCache).OfType<T>();- }-}diff --git a/src/Core/Grand.Infrastructure/Caching/RabbitMq/RabbitMqMessageCacheManager.cs b/src/Core/Grand.Infrastructure/Caching/RabbitMq/RabbitMqMessageCacheManager.csindex 9c1167cbe..347bc7bfa 100644--- a/src/Core/Grand.Infrastructure/Caching/RabbitMq/RabbitMqMessageCacheManager.cs+++ b/src/Core/Grand.Infrastructure/Caching/RabbitMq/RabbitMqMessageCacheManager.cs@@ -25,8 +25,9 @@ namespace Grand.Infrastructure.Caching.RabbitMqpublic override async Task RemoveAsync(string key, bool publisher = true){_cache.Remove(key);+if (publisher)- await _bus.Publish(new CacheMessageEvent() { ClientId= ClientId, Key = key, MessageType = (int)MessageEventType.RemoveKey });+ await _bus.Publish(new CacheMessageEvent() { ClientId = ClientId, Key = key, MessageType = (int)MessageEventType.RemoveKey });}/// <summary>@@ -36,11 +37,12 @@ namespace Grand.Infrastructure.Caching.RabbitMq/// <param name="publisher">publisher</param>public override async Task RemoveByPrefix(string prefix, bool publisher = true){- var keysToRemove = _cache.GetKeys<string>().Where(x => x.ToString().StartsWith(prefix, StringComparison.OrdinalIgnoreCase));- foreach (var key in keysToRemove)+ var entriesToRemove = _cacheEntries.Where(x => x.Key.StartsWith(prefix, StringComparison.OrdinalIgnoreCase));+ foreach (var cacheEntrie in entriesToRemove){- _cache.Remove(key);+ _cache.Remove(cacheEntrie.Key);}+if (publisher)await _bus.Publish(new CacheMessageEvent() { ClientId = ClientId, Key = prefix, MessageType = (int)MessageEventType.RemoveByPrefix });}diff --git a/src/Core/Grand.Infrastructure/Caching/Redis/RedisMessageCacheManager.cs b/src/Core/Grand.Infrastructure/Caching/Redis/RedisMessageCacheManager.csindex 6539a6eaa..502f271a9 100644--- a/src/Core/Grand.Infrastructure/Caching/Redis/RedisMessageCacheManager.cs+++ b/src/Core/Grand.Infrastructure/Caching/Redis/RedisMessageCacheManager.cs@@ -37,11 +37,12 @@ namespace Grand.Infrastructure.Caching.Redis/// <param name="publisher">publisher</param>public override Task RemoveByPrefix(string prefix, bool publisher = true){- var keysToRemove = _cache.GetKeys<string>().Where(x => x.ToString().StartsWith(prefix, StringComparison.OrdinalIgnoreCase));- foreach (var key in keysToRemove)+ var entriesToRemove = _cacheEntries.Where(x => x.Key.StartsWith(prefix, StringComparison.OrdinalIgnoreCase));+ foreach (var cacheEntrie in entriesToRemove){- _cache.Remove(key);+ _cache.Remove(cacheEntrie.Key);}+if (publisher)_messageBus.PublishAsync(new MessageEvent() { Key = prefix, MessageType = (int)MessageEventType.RemoveByPrefix });diff --git a/src/Web/Grand.Web/Controllers/InstallController.cs b/src/Web/Grand.Web/Controllers/InstallController.csindex 98adaa062..cbdcf3845 100644--- a/src/Web/Grand.Web/Controllers/InstallController.cs+++ b/src/Web/Grand.Web/Controllers/InstallController.cs@@ -247,7 +247,7 @@ namespace Grand.Web.ControllersmigrationProcess.InstallApplication();//restart application- await _cacheBase.SetAsync("Installed", true, 120);+ await _cacheBase.GetAsync("Installed", () => Task.FromResult(true), 120);return View(new InstallModel() { Installed = true });}catch (Exception exception)