diff --git a/BitFaster.Caching.UnitTests/Lru/AfterAccessLongTicksPolicyTests.cs b/BitFaster.Caching.UnitTests/Lru/AfterAccessPolicyTests.cs similarity index 92% rename from BitFaster.Caching.UnitTests/Lru/AfterAccessLongTicksPolicyTests.cs rename to BitFaster.Caching.UnitTests/Lru/AfterAccessPolicyTests.cs index ed09b371..b64fbc18 100644 --- a/BitFaster.Caching.UnitTests/Lru/AfterAccessLongTicksPolicyTests.cs +++ b/BitFaster.Caching.UnitTests/Lru/AfterAccessPolicyTests.cs @@ -10,14 +10,14 @@ namespace BitFaster.Caching.UnitTests.Lru { - public class AfterAccessLongTicksPolicyTests + public class AfterAccessPolicyTests { - private readonly AfterAccessLongTicksPolicy policy = new AfterAccessLongTicksPolicy(TimeSpan.FromSeconds(10)); + private readonly AfterAccessPolicy policy = new AfterAccessPolicy(TimeSpan.FromSeconds(10)); [Fact] public void WhenTtlIsTimeSpanMaxThrow() { - Action constructor = () => { new AfterAccessLongTicksPolicy(TimeSpan.MaxValue); }; + Action constructor = () => { new AfterAccessPolicy(TimeSpan.MaxValue); }; constructor.Should().Throw(); } @@ -25,7 +25,7 @@ public void WhenTtlIsTimeSpanMaxThrow() [Fact] public void WhenTtlIsZeroThrow() { - Action constructor = () => { new AfterAccessLongTicksPolicy(TimeSpan.Zero); }; + Action constructor = () => { new AfterAccessPolicy(TimeSpan.Zero); }; constructor.Should().Throw(); } @@ -38,7 +38,7 @@ public void WhenTtlIsMaxSetAsMax() #else var maxRepresentable = Time.MaxRepresentable; #endif - var policy = new AfterAccessLongTicksPolicy(maxRepresentable); + var policy = new AfterAccessPolicy(maxRepresentable); policy.TimeToLive.Should().BeCloseTo(maxRepresentable, TimeSpan.FromTicks(20)); } diff --git a/BitFaster.Caching.UnitTests/Lru/DiscretePolicyTests.cs b/BitFaster.Caching.UnitTests/Lru/DiscretePolicyTests.cs index 8ce569dd..5e908ad2 100644 --- a/BitFaster.Caching.UnitTests/Lru/DiscretePolicyTests.cs +++ b/BitFaster.Caching.UnitTests/Lru/DiscretePolicyTests.cs @@ -1,5 +1,4 @@ using System; -using System.Diagnostics; using System.Threading.Tasks; using BitFaster.Caching.Lru; using FluentAssertions; diff --git a/BitFaster.Caching/Lru/AfterAccessLongTicksPolicy.cs b/BitFaster.Caching/Lru/AfterAccessPolicy.cs similarity index 95% rename from BitFaster.Caching/Lru/AfterAccessLongTicksPolicy.cs rename to BitFaster.Caching/Lru/AfterAccessPolicy.cs index c107efc9..14cdb531 100644 --- a/BitFaster.Caching/Lru/AfterAccessLongTicksPolicy.cs +++ b/BitFaster.Caching/Lru/AfterAccessPolicy.cs @@ -6,7 +6,7 @@ namespace BitFaster.Caching.Lru /// /// Implement an expire after access policy. /// - internal readonly struct AfterAccessLongTicksPolicy : IItemPolicy> + internal readonly struct AfterAccessPolicy : IItemPolicy> { private readonly Duration timeToLive; private readonly Time time; @@ -18,7 +18,7 @@ namespace BitFaster.Caching.Lru /// Initializes a new instance of the AfterReadTickCount64Policy class with the specified time to live. /// /// The time to live. - public AfterAccessLongTicksPolicy(TimeSpan timeToLive) + public AfterAccessPolicy(TimeSpan timeToLive) { if (timeToLive <= TimeSpan.Zero || timeToLive > Time.MaxRepresentable) Throw.ArgOutOfRange(nameof(timeToLive), $"Value must greater than zero and less than {Time.MaxRepresentable}"); diff --git a/BitFaster.Caching/Lru/ConcurrentLru.cs b/BitFaster.Caching/Lru/ConcurrentLru.cs index 6e06ac88..bcc2eae6 100644 --- a/BitFaster.Caching/Lru/ConcurrentLru.cs +++ b/BitFaster.Caching/Lru/ConcurrentLru.cs @@ -41,8 +41,8 @@ internal static ICache Create(LruInfo info) private static ICache CreateExpireAfterAccess(LruInfo info) where TP : struct, ITelemetryPolicy { - return new ConcurrentLruCore, AfterAccessLongTicksPolicy, TP>( - info.ConcurrencyLevel, info.Capacity, info.KeyComparer, new AfterAccessLongTicksPolicy(info.TimeToExpireAfterAccess.Value), default); + return new ConcurrentLruCore, AfterAccessPolicy, TP>( + info.ConcurrencyLevel, info.Capacity, info.KeyComparer, new AfterAccessPolicy(info.TimeToExpireAfterAccess.Value), default); } private static ICache CreateExpireAfter(LruInfo info, IExpiryCalculator expiry) where TP : struct, ITelemetryPolicy diff --git a/BitFaster.Caching/Lru/ConcurrentLruCore.cs b/BitFaster.Caching/Lru/ConcurrentLruCore.cs index 7fc876f3..5ecb8dbb 100644 --- a/BitFaster.Caching/Lru/ConcurrentLruCore.cs +++ b/BitFaster.Caching/Lru/ConcurrentLruCore.cs @@ -805,7 +805,7 @@ private static CachePolicy CreatePolicy(ConcurrentLruCore lru) { var p = new Proxy(lru); - if (typeof(P) == typeof(AfterAccessLongTicksPolicy)) + if (typeof(P) == typeof(AfterAccessPolicy)) { return new CachePolicy(new Optional(p), Optional.None(), new Optional(p), Optional.None()); } diff --git a/BitFaster.Caching/Lru/DiscreteTickCount64Policy.cs b/BitFaster.Caching/Lru/DiscretePolicy.cs similarity index 100% rename from BitFaster.Caching/Lru/DiscreteTickCount64Policy.cs rename to BitFaster.Caching/Lru/DiscretePolicy.cs