Skip to content

fix: use Clear(key) instead of ClearByKey(key) for exact-key cache removal #1022

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

Open
AndersKaae wants to merge 1 commit into
base: v13/dev
Choose a base branch
from
Open

fix: use Clear(key) instead of ClearByKey(key) for exact-key cache removal #1022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions uSync.Core/Cache/SyncEntityCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ public CachedName GetName(int id)

public void AddName(int id, Guid guid, string name)
{
nameCache.ClearByKey(id.ToString());
// was ClearByKey(id.ToString()) - a full LINQ scan of every entry in nameCache
// looking for a prefix match, on every single call. id.ToString() is an exact
// key here (no other key is ever a variant/suffix of it in this cache), so a
// direct single-key removal is correct and avoids the O(n) scan entirely.
nameCache.Clear(id.ToString());
nameCache.GetCacheItem(id.ToString(), () =>
{
return new CachedName(guid, name);
Expand Down Expand Up @@ -103,7 +107,8 @@ public IEntitySlim GetEntity(Guid id)
}
else
{
keyCache.ClearByKey(id.ToString());
// was ClearByKey (O(n) scan) - id.ToString() is an exact key here too.
keyCache.Clear(id.ToString());
return null;
}
}
Expand Down Expand Up @@ -134,7 +139,8 @@ public IEntitySlim GetEntity(Guid id, UmbracoObjectTypes objectType)
}
else
{
keyCache.ClearByKey(id.ToString());
// was ClearByKey (O(n) scan) - id.ToString() is an exact key here too.
keyCache.Clear(id.ToString());
return null;
}
}
Expand Down
8 changes: 6 additions & 2 deletions uSync.Core/Serialization/Serializers/ContentTypeBaseSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,9 @@ private void EnsureAliasCache()
protected void ClearAliases()
{
aliasCache = null;
_appCache.ClearByKey($"usync_{this.Id}");
// was ClearByKey (O(n) scan of the whole shared RuntimeCache) - the key here is
// exact (this.Id is a single content type), so a direct removal is correct.
_appCache.Clear($"usync_{this.Id}");
}

protected void RemoveAlias(string alias)
Expand All @@ -675,7 +677,9 @@ protected void RemoveAlias(string alias)

private void RefreshAliasCache()
{
_appCache.ClearByKey($"usync_{this.Id}");
// was ClearByKey (O(n) scan of the whole shared RuntimeCache) - the key here is
// exact (this.Id is a single content type), so a direct removal is correct.
_appCache.Clear($"usync_{this.Id}");
_appCache.GetCacheItem($"usync_{this.Id}", () => { return aliasCache; });
}

Expand Down