removed

Alex Peck · Alex Peck · commit bd9b8ad31aac · 2025-02-01T13:42:37.000-08:00
diff --git a/BitFaster.Caching/Lru/ConcurrentLruCore.cs b/BitFaster.Caching/Lru/ConcurrentLruCore.cs
@@ -501,7 +501,7 @@ int RemoveDiscardableItems(ConcurrentQueue<I> q, ref int queueCounter)
                     {
                         if (q.TryDequeue(out var item))
                         {
-                            if (this.itemPolicy.ShouldDiscard(item))
+                            if (this.itemPolicy.ShouldDiscard(item) | item.WasRemoved)
                             {
                                 Interlocked.Decrement(ref queueCounter);
                                 this.Move(item, ItemDestination.Remove, ItemRemovedReason.Trimmed);
diff --git a/BitFaster.Caching/Lru/DiscretePolicy.cs b/BitFaster.Caching/Lru/DiscretePolicy.cs
@@ -72,7 +72,7 @@ public bool CanDiscard()
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public ItemDestination RouteHot(LongTickCountLruItem<K, V> item)
         {
-            if (this.ShouldDiscard(item))
+            if (this.ShouldDiscard(item) | item.WasRemoved)
             {
                 return ItemDestination.Remove;
             }
@@ -89,7 +89,7 @@ public ItemDestination RouteHot(LongTickCountLruItem<K, V> item)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public ItemDestination RouteWarm(LongTickCountLruItem<K, V> item)
         {
-            if (this.ShouldDiscard(item))
+            if (this.ShouldDiscard(item) | item.WasRemoved)
             {
                 return ItemDestination.Remove;
             }
@@ -106,7 +106,7 @@ public ItemDestination RouteWarm(LongTickCountLruItem<K, V> item)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public ItemDestination RouteCold(LongTickCountLruItem<K, V> item)
         {
-            if (this.ShouldDiscard(item))
+            if (this.ShouldDiscard(item) | item.WasRemoved)
             {
                 return ItemDestination.Remove;
             }
diff --git a/BitFaster.Caching/Lru/LruPolicy.cs b/BitFaster.Caching/Lru/LruPolicy.cs
@@ -50,6 +50,11 @@ public bool CanDiscard()
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public ItemDestination RouteHot(LruItem<K, V> item)
         {
+            if (item.WasRemoved)
+            {
+                return ItemDestination.Remove;
+            }
+
             if (item.WasAccessed)
             {
                 return ItemDestination.Warm;
@@ -62,6 +67,11 @@ public ItemDestination RouteHot(LruItem<K, V> item)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public ItemDestination RouteWarm(LruItem<K, V> item)
         {
+            if (item.WasRemoved)
+            {
+                return ItemDestination.Remove;
+            }
+
             if (item.WasAccessed)
             {
                 return ItemDestination.Warm;
diff --git a/BitFaster.Caching/Lru/TLruLongTicksPolicy.cs b/BitFaster.Caching/Lru/TLruLongTicksPolicy.cs
@@ -71,7 +71,7 @@ public bool CanDiscard()
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public ItemDestination RouteHot(LongTickCountLruItem<K, V> item)
         {
-            if (this.ShouldDiscard(item))
+            if (this.ShouldDiscard(item) | item.WasRemoved)
             {
                 return ItemDestination.Remove;
             }
@@ -88,7 +88,7 @@ public ItemDestination RouteHot(LongTickCountLruItem<K, V> item)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public ItemDestination RouteWarm(LongTickCountLruItem<K, V> item)
         {
-            if (this.ShouldDiscard(item))
+            if (this.ShouldDiscard(item) | item.WasRemoved)
             {
                 return ItemDestination.Remove;
             }
@@ -105,7 +105,7 @@ public ItemDestination RouteWarm(LongTickCountLruItem<K, V> item)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public ItemDestination RouteCold(LongTickCountLruItem<K, V> item)
         {
-            if (this.ShouldDiscard(item))
+            if (this.ShouldDiscard(item) | item.WasRemoved)
             {
                 return ItemDestination.Remove;
             }
diff --git a/BitFaster.Caching/Lru/TlruDateTimePolicy.cs b/BitFaster.Caching/Lru/TlruDateTimePolicy.cs
@@ -68,7 +68,7 @@ public bool CanDiscard()
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public ItemDestination RouteHot(TimeStampedLruItem<K, V> item)
         {
-            if (this.ShouldDiscard(item))
+            if (this.ShouldDiscard(item) | item.WasRemoved)
             {
                 return ItemDestination.Remove;
             }
@@ -85,7 +85,7 @@ public ItemDestination RouteHot(TimeStampedLruItem<K, V> item)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public ItemDestination RouteWarm(TimeStampedLruItem<K, V> item)
         {
-            if (this.ShouldDiscard(item))
+            if (this.ShouldDiscard(item) | item.WasRemoved)
             {
                 return ItemDestination.Remove;
             }
@@ -102,7 +102,7 @@ public ItemDestination RouteWarm(TimeStampedLruItem<K, V> item)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public ItemDestination RouteCold(TimeStampedLruItem<K, V> item)
         {
-            if (this.ShouldDiscard(item))
+            if (this.ShouldDiscard(item) | item.WasRemoved)
             {
                 return ItemDestination.Remove;
             }

Original file line number	Diff line number	Diff line change
`@@ -501,7 +501,7 @@ int RemoveDiscardableItems(ConcurrentQueue<I> q, ref int queueCounter)`
`501`	`501`	`{`
`502`	`502`	`if (q.TryDequeue(out var item))`
`503`	`503`	`{`
`504`		`- if (this.itemPolicy.ShouldDiscard(item))`
	`504`	`+ if (this.itemPolicy.ShouldDiscard(item) \| item.WasRemoved)`
`505`	`505`	`{`
`506`	`506`	`Interlocked.Decrement(ref queueCounter);`
`507`	`507`	`this.Move(item, ItemDestination.Remove, ItemRemovedReason.Trimmed);`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public bool CanDiscard()`
`72`	`72`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`73`	`73`	`public ItemDestination RouteHot(LongTickCountLruItem<K, V> item)`
`74`	`74`	`{`
`75`		`- if (this.ShouldDiscard(item))`
	`75`	`+ if (this.ShouldDiscard(item) \| item.WasRemoved)`
`76`	`76`	`{`
`77`	`77`	`return ItemDestination.Remove;`
`78`	`78`	`}`
`@@ -89,7 +89,7 @@ public ItemDestination RouteHot(LongTickCountLruItem<K, V> item)`
`89`	`89`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`90`	`90`	`public ItemDestination RouteWarm(LongTickCountLruItem<K, V> item)`
`91`	`91`	`{`
`92`		`- if (this.ShouldDiscard(item))`
	`92`	`+ if (this.ShouldDiscard(item) \| item.WasRemoved)`
`93`	`93`	`{`
`94`	`94`	`return ItemDestination.Remove;`
`95`	`95`	`}`
`@@ -106,7 +106,7 @@ public ItemDestination RouteWarm(LongTickCountLruItem<K, V> item)`
`106`	`106`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`107`	`107`	`public ItemDestination RouteCold(LongTickCountLruItem<K, V> item)`
`108`	`108`	`{`
`109`		`- if (this.ShouldDiscard(item))`
	`109`	`+ if (this.ShouldDiscard(item) \| item.WasRemoved)`
`110`	`110`	`{`
`111`	`111`	`return ItemDestination.Remove;`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,11 @@ public bool CanDiscard()`
`50`	`50`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`51`	`51`	`public ItemDestination RouteHot(LruItem<K, V> item)`
`52`	`52`	`{`
	`53`	`+ if (item.WasRemoved)`
	`54`	`+ {`
	`55`	`+ return ItemDestination.Remove;`
	`56`	`+ }`
	`57`	`+`
`53`	`58`	`if (item.WasAccessed)`
`54`	`59`	`{`
`55`	`60`	`return ItemDestination.Warm;`
`@@ -62,6 +67,11 @@ public ItemDestination RouteHot(LruItem<K, V> item)`
`62`	`67`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`63`	`68`	`public ItemDestination RouteWarm(LruItem<K, V> item)`
`64`	`69`	`{`
	`70`	`+ if (item.WasRemoved)`
	`71`	`+ {`
	`72`	`+ return ItemDestination.Remove;`
	`73`	`+ }`
	`74`	`+`
`65`	`75`	`if (item.WasAccessed)`
`66`	`76`	`{`
`67`	`77`	`return ItemDestination.Warm;`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public bool CanDiscard()`
`71`	`71`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`72`	`72`	`public ItemDestination RouteHot(LongTickCountLruItem<K, V> item)`
`73`	`73`	`{`
`74`		`- if (this.ShouldDiscard(item))`
	`74`	`+ if (this.ShouldDiscard(item) \| item.WasRemoved)`
`75`	`75`	`{`
`76`	`76`	`return ItemDestination.Remove;`
`77`	`77`	`}`
`@@ -88,7 +88,7 @@ public ItemDestination RouteHot(LongTickCountLruItem<K, V> item)`
`88`	`88`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`89`	`89`	`public ItemDestination RouteWarm(LongTickCountLruItem<K, V> item)`
`90`	`90`	`{`
`91`		`- if (this.ShouldDiscard(item))`
	`91`	`+ if (this.ShouldDiscard(item) \| item.WasRemoved)`
`92`	`92`	`{`
`93`	`93`	`return ItemDestination.Remove;`
`94`	`94`	`}`
`@@ -105,7 +105,7 @@ public ItemDestination RouteWarm(LongTickCountLruItem<K, V> item)`
`105`	`105`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`106`	`106`	`public ItemDestination RouteCold(LongTickCountLruItem<K, V> item)`
`107`	`107`	`{`
`108`		`- if (this.ShouldDiscard(item))`
	`108`	`+ if (this.ShouldDiscard(item) \| item.WasRemoved)`
`109`	`109`	`{`
`110`	`110`	`return ItemDestination.Remove;`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public bool CanDiscard()`
`68`	`68`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`69`	`69`	`public ItemDestination RouteHot(TimeStampedLruItem<K, V> item)`
`70`	`70`	`{`
`71`		`- if (this.ShouldDiscard(item))`
	`71`	`+ if (this.ShouldDiscard(item) \| item.WasRemoved)`
`72`	`72`	`{`
`73`	`73`	`return ItemDestination.Remove;`
`74`	`74`	`}`
`@@ -85,7 +85,7 @@ public ItemDestination RouteHot(TimeStampedLruItem<K, V> item)`
`85`	`85`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`86`	`86`	`public ItemDestination RouteWarm(TimeStampedLruItem<K, V> item)`
`87`	`87`	`{`
`88`		`- if (this.ShouldDiscard(item))`
	`88`	`+ if (this.ShouldDiscard(item) \| item.WasRemoved)`
`89`	`89`	`{`
`90`	`90`	`return ItemDestination.Remove;`
`91`	`91`	`}`
`@@ -102,7 +102,7 @@ public ItemDestination RouteWarm(TimeStampedLruItem<K, V> item)`
`102`	`102`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`103`	`103`	`public ItemDestination RouteCold(TimeStampedLruItem<K, V> item)`
`104`	`104`	`{`
`105`		`- if (this.ShouldDiscard(item))`
	`105`	`+ if (this.ShouldDiscard(item) \| item.WasRemoved)`
`106`	`106`	`{`
`107`	`107`	`return ItemDestination.Remove;`
`108`	`108`	`}`