TwoLayerCache concurrency bug fix

micro-elements · Jun 20, 2024 · b19d30e · b19d30e
1 parent c2b73b7
commit b19d30e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/src/MicroElements.Collections.Sources/CHANGELOG.md b/src/MicroElements.Collections.Sources/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## [1.11.0] - 2024-06-17
+- TwoLayerCache concurrency bug
+
 ## [1.10.0] - 2023-10-22
 - PollingCache become async only, unified methods, more customizations
 - TwoLayerCache fixed maxItemCount for cold cache

diff --git a/src/MicroElements.Collections.Sources/MicroElements.Collections.Sources.csproj b/src/MicroElements.Collections.Sources/MicroElements.Collections.Sources.csproj
@@ -8,7 +8,7 @@
     <TargetFramework>netstandard2.1</TargetFramework>
 
     <PackageId>MicroElements.Collections.Sources</PackageId>
-    <PackageVersion>1.10.0</PackageVersion>
+    <PackageVersion>1.11.0</PackageVersion>
     <Description>MicroElements source only package:
       Collection extensions: NotNull, Iterate, Execute, WhereNotNull, Materialize, IncludeByWildcardPatterns, ExcludeByWildcardPatterns.
       Special collections: Cache, TwoLayerCache, PollingCache.</Description>

diff --git a/src/MicroElements.Collections.Sources/MicroElements/Collections/TwoLayerCache.cs b/src/MicroElements.Collections.Sources/MicroElements/Collections/TwoLayerCache.cs
@@ -227,23 +227,21 @@ private void OnColdCacheValueAdded(TKey key)
         {
             if (_checkColdCacheSize)
             {
-                _keysQueue.Value.Enqueue(key);
-                CheckColdCacheSize();
-            }
-
-            Interlocked.Increment(ref _metrics.ItemsAdded);
-        }
-
-        private void CheckColdCacheSize()
-        {
-            if (_checkColdCacheSize && _coldCache.Count > _maxItemCount)
-            {
-                lock (_sync)
+                lock (_keysQueue)
                 {
-                    var theOldestKey = _keysQueue.Value.Dequeue();
-                    _coldCache.TryRemove(theOldestKey, out var removed);
+                    if (_coldCache.Count > _maxItemCount)
+                    {
+                        // Get the oldest key and remove it from the cold cache
+                        var theOldestKey = _keysQueue.Value.Dequeue();
+                        _coldCache.TryRemove(theOldestKey, out var removed);
+                    }
+
+                    // Store added key
+                    _keysQueue.Value.Enqueue(key);
                 }
             }
+
+            Interlocked.Increment(ref _metrics.ItemsAdded);
         }
     }