Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace Values with KeyValuePair enumerator in MemoryCache #53762

Merged
merged 4 commits into from
Jun 10, 2021
Merged

Replace Values with KeyValuePair enumerator in MemoryCache #53762

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73e8666
Update MemoryCache.cs
ezgambac Jun 5, 2021
c6a1ffd
Merge pull request #1 from ezgambac/ezgambac-patch-1-memory-cache
ezgambac Jun 5, 2021
ce69196
Changed Compact to use KeyValuePair enumerator
ezgambac Jun 5, 2021
f9300c6
Removed cache reference
ezgambac Jun 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/libraries/Microsoft.Extensions.Caching.Memory/src/MemoryCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,11 @@ void ScheduleTask(DateTimeOffset utcNow)
private static void ScanForExpiredItems(MemoryCache cache)
{
DateTimeOffset now = cache._lastExpirationScan = cache._options.Clock.UtcNow;
foreach (CacheEntry entry in cache._entries.Values)
ezgambac marked this conversation as resolved.
Show resolved Hide resolved

foreach (KeyValuePair<object, CacheEntry> item in cache._entries)
{
CacheEntry entry = item.Value;

ezgambac marked this conversation as resolved.
Show resolved Hide resolved
if (entry.CheckExpired(now))
{
cache.RemoveEntry(entry);
Expand Down Expand Up @@ -399,8 +402,9 @@ private void Compact(long removalSizeTarget, Func<CacheEntry, long> computeEntry

// Sort items by expired & priority status
DateTimeOffset now = _options.Clock.UtcNow;
foreach (CacheEntry entry in _entries.Values)
foreach (KeyValuePair<object, CacheEntry> item in _entries)
{
CacheEntry entry = item.Value;
ezgambac marked this conversation as resolved.
Show resolved Hide resolved
if (entry.CheckExpired(now))
{
entriesToRemove.Add(entry);
Expand Down