Proper cache items removal

Since cache type in 7.0 is different from one in 6.0
cache items removal should be fixed
- updated Bitfaster to 1.0.7 to get Keys collection
- updated FastConcurrentLruCache.Clear() method
- removed LruCache.GetKeysInternal()

Author: alex-kulakov

ChangeLog/7.0.4_dev.txt

@@ -0,0 +1 @@
+[main] Updated BitFaster.Caching package to version 1.0.7

Orm/Xtensive.Orm/Caching/FastConcurrentLruCache{TKey, TItem}.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Xtensive LLC.
+// Copyright (C) 2021-2023 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 
@@ -26,6 +26,11 @@ public class FastConcurrentLruCache<TKey, TItem> :
     /// <inheritdoc/>
     public long MaxSize { get; private set; }
 
+    /// <summary>
+    /// Gets keys of cached items
+    /// </summary>
+    public IEnumerable<TKey> Keys => realCache.Keys;
+
     /// <inheritdoc/>
     public override bool TryGetItem(TKey key, bool markAsHit, out TItem item) => realCache.TryGet(key, out item);
 
@@ -53,15 +58,12 @@ public override TItem Add(TItem item, bool replaceIfExists)
     public override void RemoveKey(TKey key, bool removeCompletely) => realCache.TryRemove(key);
 
     /// <inheritdoc/>
-    public override void Clear() =>
-      //TODO: Change to imp.Clear() after updating BitFaster.Caching package to 1.0.4
-      realCache = new FastConcurrentLru<TKey, TItem>((int) MaxSize);
+    public override void Clear() => realCache.Clear();
 
     /// <inheritdoc/>
     /// <exception cref="NotImplementedException"/>
     public override IEnumerator<TItem> GetEnumerator() => throw new NotImplementedException();
 
-
     /// <summary>
     /// Initializes new instance of this type.
     /// </summary>

Orm/Xtensive.Orm/Caching/LruCache{TKey, TItem}.cs

@@ -189,12 +189,6 @@ protected virtual void Cleared() { }
 
     #endregion
 
-    internal IEnumerable<TKey> GetKeysInternal()
-    {
-      foreach (KeyValuePair<TKey, TItem> cachedItem in deque)
-        yield return cachedItem.Key;
-    }
-
 
     // Constructors
 

Orm/Xtensive.Orm/Orm/StorageNodeManager.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2020 Xtensive LLC.
+// Copyright (C) 2014-2023 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Denis Krjuchkov
@@ -60,9 +60,9 @@ public bool RemoveNode([NotNull] string nodeId, bool clearQueryCache = false)
       var removeResult = handlers.StorageNodeRegistry.Remove(nodeId);
 
       if (removeResult && clearQueryCache) {
-        var queryCache = (Caching.LruCache<object, Pair<object, Linq.TranslatedQuery>>) handlers.Domain.QueryCache;
-        foreach (var key in queryCache.GetKeysInternal().Where(k => k is Pair<object, string> p && p.Second == nodeId).ToChainedBuffer()) {
-          queryCache.RemoveKey(key, true);
+        var queryCache = (Caching.FastConcurrentLruCache<object, Pair<object, Linq.ParameterizedQuery>>) handlers.Domain.QueryCache;
+        foreach (var key in queryCache.Keys.Where(k => k is (object _, string keyNodeId) && keyNodeId == nodeId).ToChainedBuffer()) {
+          queryCache.RemoveKey(key);
         }
       }
       return removeResult;

Orm/Xtensive.Orm/Xtensive.Orm.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPackable>true</IsPackable>
     <DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
@@ -41,7 +41,7 @@
   </ItemGroup>
   <ItemGroup Label="Packages">
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
-    <PackageReference Include="BitFaster.Caching" Version="1.0.3" />
+    <PackageReference Include="BitFaster.Caching" Version="1.0.7" />
   </ItemGroup>
   <ItemGroup Label="T4GeneratorsUpdaters">
     <None Update="Arithmetic\Internal\PrimitiveArithmetics.tt">