Issue 121 (#123)

* Fix sliding logic. * Fix issue #121
Avanade · Apr 8, 2021 · 01ff795 · 01ff795
1 parent aa9b984
commit 01ff795
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 22 deletions.
diff --git a/src/Beef.Core/Beef.Core.csproj b/src/Beef.Core/Beef.Core.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>Beef</RootNamespace>
-    <Version>4.1.9</Version>
+    <Version>4.1.10</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Beef Developers</Authors>
     <Company>Avanade</Company>

diff --git a/src/Beef.Core/CHANGELOG.md b/src/Beef.Core/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 Represents the **NuGet** versions.
 
+## v4.1.10
+- *Fixed:* Issue [121](https://github.com/Avanade/Beef/issues/121). `SlidingCachePolicy` sliding logic functions as expected.
+
 ## v4.1.9
 - *Fixed:* Issue [121](https://github.com/Avanade/Beef/issues/121). `SlidingCachePolicy` will now cache correctly after first expiry.
 

diff --git a/src/Beef.Core/Caching/Policy/MaxHitsCachePolicy.cs b/src/Beef.Core/Caching/Policy/MaxHitsCachePolicy.cs
@@ -49,9 +49,6 @@ public bool IsExpired
         /// </summary>
         bool ICachePolicy.HasExpired()
         {
-            if (IsExpired)
-                return true;
-
             Hits++;
             return IsExpired;
         }

diff --git a/src/Beef.Core/Caching/Policy/SlidingCachePolicy.cs b/src/Beef.Core/Caching/Policy/SlidingCachePolicy.cs
@@ -84,8 +84,14 @@ public bool IsExpired
         bool ICachePolicy.HasExpired()
         {
             var isExpired = IsExpired;
-            if (!isExpired)
-                Reset();
+            if (!isExpired && _maxDuration.TotalMilliseconds > 0)
+            {
+                var expiry = Entities.Cleaner.Clean(DateTime.Now).Add(_duration);
+                if (_maxExpiry.HasValue && expiry > _maxExpiry.Value)
+                    expiry = _maxExpiry.Value;
+
+                Expiry = expiry;
+            }
 
             Hits++;
             return isExpired;
@@ -107,7 +113,6 @@ bool ICachePolicy.HasExpired()
         public void Refresh()
         {
             Expiry = null;
-            _maxExpiry = null;
         }
 
         /// <summary>
@@ -116,16 +121,12 @@ public void Refresh()
         public void Reset()
         {
             DateTime now = Entities.Cleaner.Clean(DateTime.Now);
-            if (_maxExpiry.HasValue && _maxExpiry <= now)
-                _maxExpiry = null;
-
             DateTime? expiry = now.Add(_duration);
 
-            if (!_maxExpiry.HasValue && _maxDuration.TotalMilliseconds > 0)
+            if (_maxDuration.TotalMilliseconds > 0)
                 _maxExpiry = now.Add(_maxDuration);
-
-            if (_maxExpiry.HasValue && Expiry > _maxExpiry.Value)
-                expiry = _maxExpiry;
+            else
+                _maxExpiry = null;
 
             if (_randomizerOffset.HasValue)
                 expiry = CachePolicyManager.AddRandomizedOffsetToTime(expiry.Value, _randomizerOffset.Value);

diff --git a/tests/Beef.Core.UnitTest/Caching/Policy/SlidingCachePolicyTest.cs b/tests/Beef.Core.UnitTest/Caching/Policy/SlidingCachePolicyTest.cs
@@ -11,20 +11,54 @@ namespace Beef.Core.UnitTest.Caching.Policy
     public class SlidingCachePolicyTest
     {
         [Test]
-        public void Slide()
+        public void SlideNoMax()
         {
             var scp = new SlidingCachePolicy { Duration = new TimeSpan(0, 0, 1) };
             scp.Reset();
 
             Assert.IsFalse(((ICachePolicy)scp).HasExpired());
-            Thread.Sleep(500);
+            Thread.Sleep(450);
             Assert.IsFalse(((ICachePolicy)scp).HasExpired());
-            Thread.Sleep(500);
+            Thread.Sleep(450);
             Assert.IsFalse(((ICachePolicy)scp).HasExpired());
-            Thread.Sleep(500);
+            Thread.Sleep(450);
+            Assert.IsTrue(((ICachePolicy)scp).HasExpired());
+            Thread.Sleep(450);
+            Assert.IsTrue(((ICachePolicy)scp).HasExpired());
+        }
+
+        [Test]
+        public void SlideWithMax()
+        {
+            var scp = new SlidingCachePolicy { Duration = new TimeSpan(0, 0, 1), MaxDuration = new TimeSpan(0, 0, 2) };
+            scp.Reset();
+
+            Assert.IsFalse(((ICachePolicy)scp).HasExpired());
+            Thread.Sleep(450);
+            Assert.IsFalse(((ICachePolicy)scp).HasExpired());
+            Thread.Sleep(450);
             Assert.IsFalse(((ICachePolicy)scp).HasExpired());
-            Thread.Sleep(1500);
-            Assert.IsTrue(scp.IsExpired);
+            Thread.Sleep(450);
+            Assert.IsFalse(((ICachePolicy)scp).HasExpired());
+            Thread.Sleep(450);
+            Assert.IsFalse(((ICachePolicy)scp).HasExpired());
+            Thread.Sleep(450);
+            Assert.IsTrue(((ICachePolicy)scp).HasExpired());
+        }
+
+        [Test]
+        public void SlideWithMaxGap()
+        {
+            var scp = new SlidingCachePolicy { Duration = new TimeSpan(0, 0, 1), MaxDuration = new TimeSpan(0, 0, 2) };
+            scp.Reset();
+
+            Assert.IsFalse(((ICachePolicy)scp).HasExpired());
+            Thread.Sleep(350);
+            Assert.IsFalse(((ICachePolicy)scp).HasExpired());
+            Thread.Sleep(1100);
+            Assert.IsTrue(((ICachePolicy)scp).HasExpired());
+            Thread.Sleep(450);
+            Assert.IsTrue(((ICachePolicy)scp).HasExpired());
         }
 
         [Test]

diff --git a/tests/Beef.Core.UnitTest/RefData/Caching/ReferenceDataCacheTest.cs b/tests/Beef.Core.UnitTest/RefData/Caching/ReferenceDataCacheTest.cs
@@ -121,7 +121,7 @@ public void Exercise_SlidingCache()
                     Assert.AreEqual(3 + cycle, c.ActiveList.Count);
                     Assert.AreEqual(3 + cycle, rdc.Count);
                     Assert.IsFalse(rdc.IsExpired);
-                    System.Threading.Thread.Sleep((int)Math.Floor(policy.Duration.TotalSeconds / 2));
+                    System.Threading.Thread.Sleep((int)Math.Floor(policy.Duration.TotalMilliseconds / 2));
                 }
 
                 // reload collection cached.

diff --git a/tests/Beef.Core.UnitTest/RefData/Caching/ReferenceDataMultiTenantCacheTest.cs b/tests/Beef.Core.UnitTest/RefData/Caching/ReferenceDataMultiTenantCacheTest.cs
@@ -232,7 +232,7 @@ public void Exercise_SlidingCache()
                     Assert.AreEqual(2, c.ActiveList.Count);
                     Assert.AreEqual(1, rdc.Count);
                     Assert.IsFalse(rdc.IsExpired);
-                    System.Threading.Thread.Sleep((int)Math.Floor(policy.Duration.TotalSeconds / 2));
+                    System.Threading.Thread.Sleep((int)Math.Floor(policy.Duration.TotalMilliseconds / 2));
                 }
 
                 // reload collection cached.