Fix exception message and quick list down sizing on empty cache

neon-sunset · Jun 6, 2022 · f7260ce · f7260ce
1 parent 86d6f44
commit f7260ce
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/src/FastCache.Cached/Collections/CachedRange.Impl.cs b/src/FastCache.Cached/Collections/CachedRange.Impl.cs
@@ -256,8 +256,8 @@ private static uint GetParallelism(uint length)
     }
 
     [DoesNotReturn]
-    private static void RangeMismatch(int keys, int values)
+    private static void IncorrectLength(int keys, int values)
     {
-        throw new ArgumentOutOfRangeException($"Cannot perform 'Save()' for provided ranges - length mismatch, keys: {keys}, values: {values}.");
+        throw new ArgumentOutOfRangeException(nameof(values), values, $"Cannot perform 'Save()' for provided ranges - length mismatch. Expected: {keys}.");
     }
 }
diff --git a/src/FastCache.Cached/Collections/CachedRange.cs b/src/FastCache.Cached/Collections/CachedRange.cs
@@ -38,7 +38,7 @@ public static partial class CachedRange
         var length = keys.Length;
         if (length < 0 || length != values.Length)
         {
-            RangeMismatch(length, values.Length);
+            IncorrectLength(length, values.Length);
         }
 
         var parallelism = GetParallelism((uint)length);
@@ -73,16 +73,13 @@ public static partial class CachedRange
                 SaveListMultithreaded<K, V, IList<(K, V)>>(range, expiration, (int)parallelism);
             }
         }
+        else if (range is List<(K, V)> list)
+        {
+            SaveListSinglethreaded<K, V, List<(K, V)>>(list, expiration);
+        }
         else
         {
-            if (range is List<(K, V)> list)
-            {
-                SaveListSinglethreaded<K, V, List<(K, V)>>(list, expiration);
-            }
-            else
-            {
-                SaveListSinglethreaded<K, V, IList<(K, V)>>(range, expiration);
-            }
+            SaveListSinglethreaded<K, V, IList<(K, V)>>(range, expiration);
         }
     }
 

diff --git a/src/FastCache.Cached/EvictionQuickList.cs b/src/FastCache.Cached/EvictionQuickList.cs
@@ -75,7 +75,7 @@ internal bool Evict(bool resize = false)
         var totalCount = store.Count;
         if (totalCount is 0)
         {
-            if (_inactive.Length != Constants.QuickListMinLength)
+            if (resize || _inactive.Length != Constants.QuickListMinLength)
             {
                 ResizeInactive(Constants.QuickListMinLength);
                 AtomicSwapActive(0);