V15: Remove Nucache (#17166)
* Remove nucache reference from Web.Common * Get tests building-ish * Move ReservedFieldNamesService to the right project * Remove IPublishedSnapshotStatus * Added functionality to the INavigationQueryService to get root keys * Fixed issue with navigation * Remove IPublishedSnapshot from UmbracoContext * Begin removing usage of IPublishedSnapshot from PublishedContentExtensions * Fix PublishedContentExtensions.cs * Don't use snapshots in delivery media api * Use IPublishedMediaCache in QueryMediaApiController * Remove more usages of IPublishedSnapshotAccessor * Comment out tests * Remove more usages of PublishedSnapshotAccessor * Remove PublishedSnapshot from property * Fixed test build * Fix errors * Fix some tests * Delete NuCache 🎉 * Implement DatabaseCacheRebuilder * Remove usage of IPublishedSnapshotService * Remove IPublishedSnapshotService * Remove TestPublishedSnapshotAccessor and make tests build * Don't test Snapshot cachelevel It's no longer supported * Fix BlockEditorConverter Element != Element document type * Remember to set cachemanager * Fix RichTextParserTests * Implement TryGetLevel on INavigationQueryService * Fake level and obsolete it in PublishedContent * Remove ChildrenForAllCultures * Hack Path property on PublishedContent * Remove usages of IPublishedSnapshot in tests * More ConvertersTests * Add hybrid cache to integration tests We can actually do this now because we no longer save files on disk * Rename IPublishedSnapshotRebuilder to ICacheRebuilder * Comment out tests * V15: Replacing the usages of Parent (navigation data) from IPublishedContent (#17125) * Fix .Parent references in PublishedContentExtensions * Add missing methods to FriendlyPublishedContentExtensions (ones that you were able to call on the content directly as they now require extra params) * Fix references from the extension methods * Fix dependencies in tests * Replace IPublishedSnapshotAccessor with the content cache in tests * Resolving more .Parent references * Fix unit tests * Obsolete and use extension methods * Remove private method and use extension instead * Moving code around * Fix tests * Fix more references * Cleanup * Fix more usages * Resolve merge conflict * Fix tests * Cleanup * Fix more tests * Fixed unit tests * Cleanup * Replace last usages --------- Co-authored-by: Bjarke Berg <mail@bergmania.dk> * Remove usage of IPublishedSnapshotAccessor from IRequestItemProvider * Post merge fixup * Remo IPublishedSnapshot * Add HasAny to IDocumentUrlService * Fix TextBuilder * Fix modelsbuilder tests * Use explicit types * Implement GetByContentType * Support element types in PublishedContentTypeCache * Run enlistments before publishing notifications * Fix elements cache refreshing * Implement GetByUdi * Implement GetAtRoot * Implement GetByRoute * Reimplement GetRouteById * Fix blocks unit tests * Initialize domain cache on boot * Only return routes with domains on non default lanauges * V15: Replacing the usages of `Children` (navigation data) from `IPublishedContent` (#17159) * Update params in PublishedContentExtensions to the general interfaces for the published cache and navigation service, so that we can use the extension methods on both documents and media * Introduce GetParent() which uses the right services * Fix obsolete message on .Parent * Obsolete .Children * Fix usages of Children for ApiMediaQueryService * Fix usage in internal * Fix usages in views * Fix indentation * Fix issue with delete language * Update nuget pacakges * Clear elements cache when content is deleted instead of trying to update it * Reset publishedModelFactory * Fixed publishing --------- Co-authored-by: Bjarke Berg <mail@bergmania.dk> Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> Co-authored-by: kjac <kja@umbraco.dk>
This commit is contained in:
Mole
@@ -15,10 +15,10 @@ internal class PublishedElementPropertyBase : PublishedPropertyBase
|
||||
// so making it configurable.
|
||||
private const bool FullCacheWhenPreviewing = true;
|
||||
private readonly object _locko = new();
|
||||
private readonly IPublishedSnapshotAccessor? _publishedSnapshotAccessor;
|
||||
private readonly object? _sourceValue;
|
||||
protected readonly bool IsMember;
|
||||
protected readonly bool IsPreviewing;
|
||||
private readonly ICacheManager? _cacheManager;
|
||||
private CacheValues? _cacheValues;
|
||||
|
||||
private bool _interInitialized;
|
||||
@@ -30,14 +30,14 @@ internal class PublishedElementPropertyBase : PublishedPropertyBase
|
||||
IPublishedElement element,
|
||||
bool previewing,
|
||||
PropertyCacheLevel referenceCacheLevel,
|
||||
object? sourceValue = null,
|
||||
IPublishedSnapshotAccessor? publishedSnapshotAccessor = null)
|
||||
ICacheManager? cacheManager,
|
||||
object? sourceValue = null)
|
||||
: base(propertyType, referenceCacheLevel)
|
||||
{
|
||||
_sourceValue = sourceValue;
|
||||
_publishedSnapshotAccessor = publishedSnapshotAccessor;
|
||||
Element = element;
|
||||
IsPreviewing = previewing;
|
||||
_cacheManager = cacheManager;
|
||||
IsMember = propertyType.ContentType?.ItemType == PublishedItemType.Member;
|
||||
}
|
||||
|
||||
@@ -118,33 +118,13 @@ internal class PublishedElementPropertyBase : PublishedPropertyBase
|
||||
}
|
||||
}
|
||||
|
||||
private IAppCache? GetSnapshotCache()
|
||||
{
|
||||
// cache within the snapshot cache, unless previewing, then use the snapshot or
|
||||
// elements cache (if we don't want to pollute the elements cache with short-lived
|
||||
// data) depending on settings
|
||||
// for members, always cache in the snapshot cache - never pollute elements cache
|
||||
if (_publishedSnapshotAccessor is null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!_publishedSnapshotAccessor.TryGetPublishedSnapshot(out IPublishedSnapshot? publishedSnapshot))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
return (IsPreviewing == false || FullCacheWhenPreviewing) && IsMember == false
|
||||
? publishedSnapshot!.ElementsCache
|
||||
: publishedSnapshot!.SnapshotCache;
|
||||
}
|
||||
|
||||
private CacheValues GetCacheValues(PropertyCacheLevel cacheLevel)
|
||||
{
|
||||
CacheValues cacheValues;
|
||||
switch (cacheLevel)
|
||||
{
|
||||
case PropertyCacheLevel.None:
|
||||
case PropertyCacheLevel.Snapshot:
|
||||
// never cache anything
|
||||
cacheValues = new CacheValues();
|
||||
break;
|
||||
@@ -153,17 +133,7 @@ internal class PublishedElementPropertyBase : PublishedPropertyBase
|
||||
cacheValues = _cacheValues ??= new CacheValues();
|
||||
break;
|
||||
case PropertyCacheLevel.Elements:
|
||||
// cache within the elements cache, depending...
|
||||
IAppCache? snapshotCache = GetSnapshotCache();
|
||||
cacheValues = (CacheValues?)snapshotCache?.Get(ValuesCacheKey, () => new CacheValues()) ??
|
||||
new CacheValues();
|
||||
break;
|
||||
case PropertyCacheLevel.Snapshot:
|
||||
IPublishedSnapshot? publishedSnapshot = _publishedSnapshotAccessor?.GetRequiredPublishedSnapshot();
|
||||
|
||||
// cache within the snapshot cache
|
||||
IAppCache? facadeCache = publishedSnapshot?.SnapshotCache;
|
||||
cacheValues = (CacheValues?)facadeCache?.Get(ValuesCacheKey, () => new CacheValues()) ??
|
||||
cacheValues = (CacheValues?)_cacheManager?.ElementsCache.Get(ValuesCacheKey, () => new CacheValues()) ??
|
||||
new CacheValues();
|
||||
break;
|
||||
default:
|
||||
|
||||
Reference in New Issue
Block a user