diff --git a/BitFaster.Caching/Lru/Builder/AsyncConcurrentLruBuilder.cs b/BitFaster.Caching/Lru/Builder/AsyncConcurrentLruBuilder.cs index 92272032..5fc7871c 100644 --- a/BitFaster.Caching/Lru/Builder/AsyncConcurrentLruBuilder.cs +++ b/BitFaster.Caching/Lru/Builder/AsyncConcurrentLruBuilder.cs @@ -16,7 +16,7 @@ internal AsyncConcurrentLruBuilder(LruInfo info) /// public override IAsyncCache Build() { - return LruFactory.CreateConcurrent(this.info) as IAsyncCache; + return ConcurrentLru.Create(this.info) as IAsyncCache; } } } diff --git a/BitFaster.Caching/Lru/LruFactory.cs b/BitFaster.Caching/Lru/ConcurrentLru.cs similarity index 80% rename from BitFaster.Caching/Lru/LruFactory.cs rename to BitFaster.Caching/Lru/ConcurrentLru.cs index 82ceecb0..2ef86e4b 100644 --- a/BitFaster.Caching/Lru/LruFactory.cs +++ b/BitFaster.Caching/Lru/ConcurrentLru.cs @@ -1,4 +1,4 @@ -using System.Linq.Expressions; + using BitFaster.Caching.Lru.Builder; namespace BitFaster.Caching.Lru @@ -6,14 +6,14 @@ namespace BitFaster.Caching.Lru /// /// Factory class for creating ConcurrentLru variants. /// - internal static class LruFactory + internal static class ConcurrentLru { /// /// Creates a ConcurrentLru instance based on the provided LruInfo. /// /// The LruInfo /// A ConcurrentLru - internal static ICache CreateConcurrent(LruInfo info) + internal static ICache Create(LruInfo info) { if (info.TimeToExpireAfterWrite.HasValue && info.TimeToExpireAfterAccess.HasValue) Throw.InvalidOp("Specifying both ExpireAfterWrite and ExpireAfterAccess is not supported."); @@ -23,13 +23,13 @@ internal static ICache CreateConcurrent(LruInfo info) (true, false, false) => new ConcurrentLru(info.ConcurrencyLevel, info.Capacity, info.KeyComparer), (true, true, false) => new ConcurrentTLru(info.ConcurrencyLevel, info.Capacity, info.KeyComparer, info.TimeToExpireAfterWrite.Value), (false, true, false) => new FastConcurrentTLru(info.ConcurrencyLevel, info.Capacity, info.KeyComparer, info.TimeToExpireAfterWrite.Value), - (true, false, true) => CreateExpireAfterAccess>(info), - (false, false, true) => CreateExpireAfterAccess>(info), + (true, false, true) => CreateExpireAfterAccess>(info), + (false, false, true) => CreateExpireAfterAccess>(info), _ => new FastConcurrentLru(info.ConcurrencyLevel, info.Capacity, info.KeyComparer), }; } - private static ICache CreateExpireAfterAccess(LruInfo info) where TP : struct, ITelemetryPolicy + 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); diff --git a/BitFaster.Caching/Lru/ConcurrentLruBuilder.cs b/BitFaster.Caching/Lru/ConcurrentLruBuilder.cs index 541d5897..35f30187 100644 --- a/BitFaster.Caching/Lru/ConcurrentLruBuilder.cs +++ b/BitFaster.Caching/Lru/ConcurrentLruBuilder.cs @@ -40,7 +40,7 @@ internal ConcurrentLruBuilder(LruInfo info) /// public override ICache Build() { - return LruFactory.CreateConcurrent(this.info); + return ConcurrentLru.Create(this.info); } } }