Fix no check expires when get cache count in memory cache (#498)

* fix: no check expires when get cache count in memory cache * styles: format code #497 * feat: add test
dotnetcore · Oct 13, 2023 · 151be2b · 151be2b
1 parent 8f2c764
commit 151be2b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/src/EasyCaching.InMemory/Internal/InMemoryCaching.cs b/src/EasyCaching.InMemory/Internal/InMemoryCaching.cs
@@ -49,8 +49,8 @@ public void Clear(string prefix = "")
         public int GetCount(string prefix = "")
         {
             return string.IsNullOrWhiteSpace(prefix)
-                ? _memory.Count
-                : _memory.Count(x => x.Key.StartsWith(prefix, StringComparison.OrdinalIgnoreCase));
+                ? _memory.Values.Where(x => x.ExpiresAt > SystemClock.UtcNow).Count()
+                : _memory.Values.Where(x => x.Key.StartsWith(prefix, StringComparison.OrdinalIgnoreCase) && x.ExpiresAt > SystemClock.UtcNow).Count();
         }
 
         internal void RemoveExpiredKey(string key)
@@ -283,7 +283,7 @@ public int RemoveByPattern(string searchKey, SearchKeyPattern searchPattern)
         public IEnumerable<string> GetAllKeys(string prefix)
         {
             return _memory.Values.Where(x => x.Key.StartsWith(prefix, StringComparison.OrdinalIgnoreCase) && x.ExpiresAt > SystemClock.UtcNow)
-                .Select(x=> x.Key).ToList();
+                .Select(x => x.Key).ToList();
         }
 
         private static bool FilterByPattern(string key, string searchKey, SearchKeyPattern searchKeyPattern)
@@ -314,10 +314,10 @@ public IDictionary<string, CacheValue<T>> GetAll<T>(IEnumerable<string> keys)
 
         public IDictionary<string, CacheValue<T>> GetAll<T>(string prefix = "")
         {
-            var values = string.IsNullOrEmpty(prefix) 
-                ? _memory.Values.Where(x => x.ExpiresAt > SystemClock.UtcNow) 
+            var values = string.IsNullOrEmpty(prefix)
+                ? _memory.Values.Where(x => x.ExpiresAt > SystemClock.UtcNow)
                 : _memory.Values.Where(x => x.Key.StartsWith(prefix, StringComparison.OrdinalIgnoreCase) && x.ExpiresAt > SystemClock.UtcNow);
-            
+
             return values.ToDictionary(k => k.Key, v => new CacheValue<T>(v.GetValue<T>(_options.EnableReadDeepClone), true));
         }
 

diff --git a/test/EasyCaching.UnitTests/CachingTests/MemoryCachingProviderTest.cs b/test/EasyCaching.UnitTests/CachingTests/MemoryCachingProviderTest.cs
@@ -155,6 +155,21 @@ public void Evicted_Event_Should_Trigger_When_GetExpiredItems()
             _provider.Get<string>(key1);
             System.Threading.Thread.Sleep(500);
         }
+
+        [Fact]
+        public async void Issues497_GetCountAsync_Check_Expires_Test()
+        {
+            for (int i = 0; i < 9; i++)
+            {
+                await _provider.SetAsync(Guid.NewGuid().ToString(), $"value-{i}", TimeSpan.FromSeconds(5));
+            }
+
+            Assert.Equal(9, await _provider.GetCountAsync());
+
+            await Task.Delay(5000);
+
+            Assert.Equal(0, await _provider.GetCountAsync());
+        }
     }
 
     public class MemoryCachingProviderWithFactoryTest : BaseCachingProviderWithFactoryTest