Merge branch 'main' into users/alexpeck/opt2

Author: bitfaster

BitFaster.Caching.ThroughputAnalysis/CacheFactory.cs

@@ -1,4 +1,5 @@
 
+using System;
 using System.Collections.Generic;
 using System.Data;
 using BitFaster.Caching.Lfu;
@@ -105,6 +106,35 @@ public ConcurrentLfuFactory(int capacity)
         }
     }
 
+    public class ConcurrentTLfuFactory : ICacheFactory
+    {
+        private readonly int capacity;
+
+        public ConcurrentTLfuFactory(int capacity)
+        {
+            this.capacity = capacity;
+        }
+
+        public string Name => "ConcurrentTLfu";
+
+        public DataRow DataRow { get; set; }
+
+        public (IScheduler, ICache<long, int>) Create(int threadCount)
+        {
+            var scheduler = new BackgroundThreadScheduler();
+
+            var cache = new ConcurrentLfuBuilder<long, int>()
+                .WithCapacity(capacity)
+                .WithScheduler(scheduler)
+                .WithConcurrencyLevel(threadCount)
+                .WithKeyComparer(EqualityComparer<long>.Default)
+                .WithExpireAfterWrite(TimeSpan.FromHours(1))
+                .Build();
+
+            return (scheduler, cache);
+        }
+    }
+
     public class ClassicLruFactory : ICacheFactory
     {
         private readonly int capacity;

BitFaster.Caching.UnitTests/Lfu/ConcurrentLfuCoreTests.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using BitFaster.Caching.Lfu;
+using BitFaster.Caching.UnitTests.Retry;
 using FluentAssertions;
 using Xunit;
 
@@ -85,7 +86,7 @@ public void WhenItemIsUpdatedItIsUpdated()
             value.Should().Be(2);
         }
 
-        [Fact]
+        [RetryFact]
         public void WhenItemDoesNotExistUpdatedAddsItem()
         {
             lfu.AddOrUpdate(1, 2);

BitFaster.Caching.UnitTests/Lfu/ConcurrentTLfuTests.cs

@@ -112,7 +112,7 @@ public void WhenKeyTypeMismatchTryGetTimeToExpireReturnsFalse()
 
         // policy can expire after write
 
-        [Fact]
+        [RetryFact]
         public void WhenItemIsNotExpiredItIsNotRemoved()
         {
             lfu.GetOrAdd(1, valueFactory.Create);

BitFaster.Caching.UnitTests/Lru/ConcurrentLruAfterAccessTests.cs

@@ -46,7 +46,7 @@ public void TimeToLiveIsCtorArg()
             this.lru.Policy.ExpireAfterAccess.Value.TimeToLive.Should().Be(timeToLive);
         }
 
-        [Fact]
+        [RetryFact]
         public void WhenItemIsNotExpiredItIsNotRemoved()
         {
             lru.GetOrAdd(1, valueFactory.Create);

BitFaster.Caching.UnitTests/Lru/ConcurrentTLruTests.cs

@@ -48,7 +48,7 @@ public void TimeToLiveIsCtorArg()
             this.lru.Policy.ExpireAfterWrite.Value.TimeToLive.Should().Be(timeToLive);
         }
 
-        [Fact]
+        [RetryFact]
         public void WhenItemIsNotExpiredItIsNotRemoved()
         {
             lru.GetOrAdd(1, valueFactory.Create);

BitFaster.Caching/Lfu/NodePolicy.cs

@@ -97,9 +97,12 @@ public void AdvanceTime()
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void OnRead(TimeOrderNode<K, V> node)
         {
-            var currentExpiry = node.TimeToExpire - current;
-            node.TimeToExpire = current + expiryCalculator.GetExpireAfterRead(node.Key, node.Value, currentExpiry);
-            wheel.Reschedule(node);
+            var oldTte = node.TimeToExpire;
+            node.TimeToExpire = current + expiryCalculator.GetExpireAfterRead(node.Key, node.Value, node.TimeToExpire - current);
+            if (oldTte.raw != node.TimeToExpire.raw)
+            {
+                wheel.Reschedule(node);
+            }
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -113,9 +116,12 @@ public void OnWrite(TimeOrderNode<K, V> node)
             }
             else
             {
-                var currentExpiry = node.TimeToExpire - current;
-                node.TimeToExpire = current + expiryCalculator.GetExpireAfterUpdate(node.Key, node.Value, currentExpiry);
-                wheel.Reschedule(node);
+                var oldTte = node.TimeToExpire;
+                node.TimeToExpire = current + expiryCalculator.GetExpireAfterUpdate(node.Key, node.Value, node.TimeToExpire - current);
+                if (oldTte.raw != node.TimeToExpire.raw)
+                {
+                    wheel.Reschedule(node);
+                }
             }
         }