yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PublishedContent - refactor PublishedContentType cache

Browse Source
This commit is contained in:
Stephan
2013-09-23 16:18:39 +02:00
parent eb4317a9c1
commit ac2d010df3
3 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Web.Caching;
using System.Web.UI;
using Umbraco.Core.Cache;
namespace Umbraco.Core.Models.PublishedContent
@@ -94,32 +95,35 @@ namespace Umbraco.Core.Models.PublishedContent
#region Cache
// these methods are NOT called anymore
// instead, ContentTypeCacheRefresher and DataTypeCacheRefresher directly handle the ApplicationCache
// these methods are called by ContentTypeCacheRefresher and DataTypeCacheRefresher
//// internal, called by ContentTypeCacheRefresher
//internal static void ClearAll()
//{
// Logging.LogHelper.Debug<PublishedContentType>("Clear all.");
// ApplicationContext.Current.ApplicationCache.ClearStaticCacheByKeySearch("PublishedContentType_");
//}
internal static void ClearAll()
{
Logging.LogHelper.Debug<PublishedContentType>("Clear all.");
// ok and faster to do it by types, assuming noone else caches PublishedContentType instances
//ApplicationContext.Current.ApplicationCache.ClearStaticCacheByKeySearch("PublishedContentType_");
ApplicationContext.Current.ApplicationCache.ClearStaticCacheObjectTypes<PublishedContentType>();
}
//// internal, called by ContentTypeCacheRefresher
//internal static void ClearContentType(int id)
//{
// Logging.LogHelper.Debug<PublishedContentType>("Clear content type w/id {0}.", () => id);
// // requires a predicate because the key does not contain the ID
// ApplicationContext.Current.ApplicationCache.ClearStaticCacheObjectTypes<PublishedContentType>(
// (key, value) => value.Id == id);
//}
internal static void ClearContentType(int id)
{
Logging.LogHelper.Debug<PublishedContentType>("Clear content type w/id {0}.", () => id);
// requires a predicate because the key does not contain the ID
// faster than key strings comparisons anyway
ApplicationContext.Current.ApplicationCache.ClearStaticCacheObjectTypes<PublishedContentType>(
(key, value) => value.Id == id);
}
//// internal, called by DataTypeCacheRefresher
//internal static void ClearDataType(int id)
//{
// Logging.LogHelper.Debug<PublishedContentType>("Clear data type w/id {0}.", () => id);
// ApplicationContext.Current.ApplicationCache.ClearStaticCacheObjectTypes<PublishedContentType>(
// (key, value) => value.PropertyTypes.Any(x => x.DataTypeId == id));
//}
internal static void ClearDataType(int id)
{
Logging.LogHelper.Debug<PublishedContentType>("Clear data type w/id {0}.", () => id);
// there is no recursion to handle here because a PublishedContentType contains *all* its
// properties ie both its own properties and those that were inherited (it's based upon an
// IContentTypeComposition) and so every PublishedContentType having a property based upon
// the cleared data type, be it local or inherited, will be cleared.
ApplicationContext.Current.ApplicationCache.ClearStaticCacheObjectTypes<PublishedContentType>(
(key, value) => value.PropertyTypes.Any(x => x.DataTypeId == id));
}
public static PublishedContentType Get(PublishedItemType itemType, string alias)
{

9
src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
View File

@@ -131,10 +131,7 @@ namespace Umbraco.Web.Cache
//clear static object cache
global::umbraco.cms.businesslogic.ContentType.RemoveAllDataTypeCache();
// see PublishedContentType for details
// can do by object types - noone else should cache published content type
//ApplicationContext.Current.ApplicationCache.ClearStaticCacheByKeySearch("PublishedContentType_");
ApplicationContext.Current.ApplicationCache.ClearStaticCacheObjectTypes<PublishedContentType>();
PublishedContentType.ClearAll();
base.RefreshAll();
}
@@ -256,9 +253,7 @@ namespace Umbraco.Web.Cache
//clears the dictionary object cache of the legacy ContentType
global::umbraco.cms.businesslogic.ContentType.RemoveFromDataTypeCache(payload.Alias);
// see PublishedContentType for details
ApplicationContext.Current.ApplicationCache.ClearStaticCacheObjectTypes<PublishedContentType>(
(key, value) => value.Id == payload.Id); // faster than key strings comparisons
PublishedContentType.ClearContentType(payload.Id);
//need to recursively clear the cache for each child content type
foreach (var descendant in payload.DescendantPayloads)

4
src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
View File

@@ -123,9 +123,7 @@ namespace Umbraco.Web.Cache
ApplicationContext.Current.ApplicationCache.ClearCacheByKeySearch(
string.Format("{0}{1}", CacheKeys.DataTypeCacheKey, payload.UniqueId));
// see PublishedContentType for details
ApplicationContext.Current.ApplicationCache.ClearStaticCacheObjectTypes<PublishedContentType>(
(key, value) => value.PropertyTypes.Any(x => x.DataTypeId == payload.Id));
PublishedContentType.ClearDataType(payload.Id);
});
base.Refresh(jsonPayload);