V15: Hybrid Caching

Directory.Packages.props

@@ -12,27 +12,29 @@
   </ItemGroup>
   <!-- Microsoft packages -->
   <ItemGroup>
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="9.0.0-preview.5.24306.11" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="9.0.0-preview.7.24406.2" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.0-preview.5.24306.3" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0-preview.5.24306.3" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0-preview.5.24306.3" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.0-preview.7.24405.3" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0-preview.7.24405.3" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0-preview.7.24405.3" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0-preview.5.24306.7" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0-preview.5.24306.7" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-preview.5.24306.7" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0-preview.5.24306.7" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0-preview.5.24306.7" />
-    <PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0-preview.5.24306.11" />
-    <PackageVersion Include="Microsoft.Extensions.FileProviders.Physical" Version="9.0.0-preview.5.24306.7" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0-preview.5.24306.7" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.0-preview.5.24306.7" />
-    <PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="9.0.0-preview.5.24306.11" />
-    <PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="9.0.0-preview.5.24306.11" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0-preview.5.24306.7" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.0-preview.5.24306.7" />
-    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0-preview.5.24306.7" />
-    <PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.0-preview.5.24306.7" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0-preview.7.24405.7" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0-preview.7.24405.7" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.SqlServer" Version="9.0.0-preview.7.24406.2" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-preview.7.24405.7" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0-preview.7.24405.7" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0-preview.7.24405.7" />
+    <PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0-preview.7.24406.2" />
+    <PackageVersion Include="Microsoft.Extensions.FileProviders.Physical" Version="9.0.0-preview.7.24405.7"/>
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0-preview.7.24405.7" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.0-preview.7.24405.7" />
+    <PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="9.0.0-preview.7.24406.2" />
+    <PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="9.0.0-preview.7.24406.2" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0-preview.7.24405.7" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.0-preview.7.24405.7" />
+    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0-preview.7.24405.7" />
+    <PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.0-preview.7.24405.7" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="9.0.0-preview.7.24406.2" />
   </ItemGroup>
   <!-- Umbraco packages -->
   <ItemGroup>
@@ -83,7 +85,7 @@
     <!-- Dazinator.Extensions.FileProviders brings in a vulnerable version of System.Net.Http -->
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <!-- Examine brings in a vulnerable version of System.Security.Cryptography.Xml -->
-    <PackageVersion Include="System.Security.Cryptography.Xml" Version="9.0.0-preview.5.24306.7" />
+    <PackageVersion Include="System.Security.Cryptography.Xml" Version="9.0.0-preview.7.24405.7" />
     <!-- Both Dazinator.Extensions.FileProviders and MiniProfiler.AspNetCore.Mvc bring in a vulnerable version of System.Text.RegularExpressions -->
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
     <!-- Both OpenIddict.AspNetCore, Npoco.SqlServer and Microsoft.EntityFrameworkCore.SqlServer bring in a vulnerable version of Microsoft.IdentityModel.JsonWebTokens -->

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100-preview.5.24307.3",
+    "version": "9.0.100-preview.7.24407.12",
     "rollForward": "latestFeature",
     "allowPrerelease": true
   }

src/Umbraco.Cms.Api.Management/DependencyInjection/UmbracoBuilder.BackOffice.cs

@@ -35,6 +35,7 @@ public static IUmbracoBuilder
         .AddWebServer()
         .AddRecurringBackgroundJobs()
         .AddNuCache()
+        .AddUmbracoHybridCache()
         .AddDistributedCache()
         .AddCoreNotifications()
         .AddExamine()

src/Umbraco.Cms.Api.Management/Umbraco.Cms.Api.Management.csproj

@@ -14,6 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Umbraco.PublishedCache.HybridCache\Umbraco.PublishedCache.HybridCache.csproj" />
     <ProjectReference Include="..\Umbraco.Cms.Api.Common\Umbraco.Cms.Api.Common.csproj" />
     <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
   </ItemGroup>

src/Umbraco.Core/Cache/Refreshers/Implement/DomainCacheRefresher.cs

@@ -17,8 +17,10 @@ public DomainCacheRefresher(
         IPublishedSnapshotService publishedSnapshotService,
         IEventAggregator eventAggregator,
         ICacheRefresherNotificationFactory factory)
-        : base(appCaches, serializer, eventAggregator, factory) =>
+        : base(appCaches, serializer, eventAggregator, factory)
+    {
         _publishedSnapshotService = publishedSnapshotService;
+    }
 
     #region Json
 

src/Umbraco.Core/Constants-Configuration.cs

@@ -65,6 +65,7 @@ public static class Configuration
         public const string ConfigDataTypes = ConfigPrefix + "DataTypes";
         public const string ConfigPackageManifests = ConfigPrefix + "PackageManifests";
         public const string ConfigWebhook = ConfigPrefix + "Webhook";
+        public const string ConfigCache = ConfigPrefix + "Cache";
 
         public static class NamedOptions
         {

src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs

@@ -5,7 +5,7 @@
 using Umbraco.Cms.Core.Configuration;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Configuration.Models.Validation;
-using Umbraco.Extensions;
+using Umbraco.Cms.Core.Models;
 
 namespace Umbraco.Cms.Core.DependencyInjection;
 
@@ -85,7 +85,8 @@ public static IUmbracoBuilder AddConfiguration(this IUmbracoBuilder builder)
             .AddUmbracoOptions<ContentDashboardSettings>()
             .AddUmbracoOptions<HelpPageSettings>()
             .AddUmbracoOptions<DataTypesSettings>()
-            .AddUmbracoOptions<WebhookSettings>();
+            .AddUmbracoOptions<WebhookSettings>()
+            .AddUmbracoOptions<CacheSettings>();
 
         // Configure connection string and ensure it's updated when the configuration changes
         builder.Services.AddSingleton<IConfigureOptions<ConnectionStrings>, ConfigureConnectionStrings>();

src/Umbraco.Core/Models/CacheSettings.cs

@@ -0,0 +1,13 @@
+using Umbraco.Cms.Core.Configuration.Models;
+
+namespace Umbraco.Cms.Core.Models;
+
+[UmbracoOptions(Constants.Configuration.ConfigCache)]
+public class CacheSettings
+{
+    /// <summary>
+    ///     Gets or sets a value for the collection of content type ids to always have in the cache.
+    /// </summary>
+    public List<Guid> ContentTypeKeys { get; set; } =
+        new();
+}

src/Umbraco.Core/Models/PublishedContent/IPublishedMember.cs

@@ -0,0 +1,22 @@
+namespace Umbraco.Cms.Core.Models.PublishedContent;
+
+public interface IPublishedMember : IPublishedContent
+{
+    public string Email { get; }
+
+    public string UserName { get; }
+
+    public string? Comments { get; }
+
+    public bool IsApproved { get; }
+
+    public bool IsLockedOut { get; }
+
+    public DateTime? LastLockoutDate { get; }
+
+    public DateTime CreationDate { get; }
+
+    public DateTime? LastLoginDate { get; }
+
+    public DateTime? LastPasswordChangedDate { get; }
+}

src/Umbraco.Core/Models/PublishedContent/IPublishedMemberCache.cs

@@ -10,7 +10,7 @@ public interface IPublishedMemberCache
     /// </summary>
     /// <param name="member"></param>
     /// <returns></returns>
-    IPublishedContent? Get(IMember member);
+    IPublishedMember? Get(IMember member);
 
     /// <summary>
     ///     Gets a content type identified by its unique identifier.
@@ -26,4 +26,12 @@ public interface IPublishedMemberCache
     /// <returns>The content type, or null.</returns>
     /// <remarks>The alias is case-insensitive.</remarks>
     IPublishedContentType GetContentType(string alias);
+
+    /// <summary>
+    ///     Get an <see cref="IPublishedContent" /> from an <see cref="IMember" />
+    /// </summary>
+    /// <param name="key">The key of the member to fetch</param>
+    /// <param name="preview">Will fetch draft if this is set to true</param>
+    /// <returns></returns>
+    Task<IPublishedMember?> GetAsync(IMember member);
 }

src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs

@@ -196,7 +196,7 @@ private void InitializeLocked()
 
             var deliveryApiPropertyValueConverter = _converter as IDeliveryApiPropertyValueConverter;
 
-            _cacheLevel = _converter?.GetPropertyCacheLevel(this) ?? PropertyCacheLevel.Snapshot;
+            _cacheLevel = _converter?.GetPropertyCacheLevel(this) ?? PropertyCacheLevel.Elements;
             _deliveryApiCacheLevel = deliveryApiPropertyValueConverter?.GetDeliveryApiPropertyCacheLevel(this) ?? _cacheLevel;
             _deliveryApiCacheLevelForExpansion = deliveryApiPropertyValueConverter?.GetDeliveryApiPropertyCacheLevelForExpansion(this) ?? _cacheLevel;
             _modelClrType = _converter?.GetPropertyValueType(this) ?? typeof(object);

src/Umbraco.Core/PropertyEditors/ContentPickerPropertyEditor.cs

@@ -67,7 +67,7 @@ public IEnumerable<UmbracoEntityReference> GetReferences(object? value)
         // starting in v14 the passed in value is always a guid, we store it as a document Udi string. Else it's an invalid value
         public override object? FromEditor(ContentPropertyData editorValue, object? currentValue) =>
             editorValue.Value is not null
-            && Guid.TryParse(editorValue.Value as string, out Guid guidValue)
+            && Guid.TryParse(editorValue.Value.ToString(), out Guid guidValue)
                 ? GuidUdi.Create(Constants.UdiEntityType.Document, guidValue).ToString()
                 : null;
 

src/Umbraco.Core/PropertyEditors/PropertyCacheLevel.cs

@@ -30,6 +30,7 @@ public enum PropertyCacheLevel
     ///     In most cases, a snapshot is created per request, and therefore this is
     ///     equivalent to cache the value for the duration of the request.
     /// </remarks>
+    [Obsolete("Caching no longer supports snapshotting")]
     Snapshot = 3,
 
     /// <summary>

src/Umbraco.Core/PropertyEditors/ValueConverters/ContentPickerValueConverter.cs

@@ -17,14 +17,14 @@ public class ContentPickerValueConverter : PropertyValueConverterBase, IDelivery
         Constants.Conventions.Content.Redirect.ToLower(CultureInfo.InvariantCulture),
     };
 
-    private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
+    private readonly IPublishedContentCache _publishedContentCache;
     private readonly IApiContentBuilder _apiContentBuilder;
 
     public ContentPickerValueConverter(
-        IPublishedSnapshotAccessor publishedSnapshotAccessor,
+        IPublishedContentCache publishedContentCache,
         IApiContentBuilder apiContentBuilder)
     {
-        _publishedSnapshotAccessor = publishedSnapshotAccessor;
+        _publishedContentCache = publishedContentCache;
         _apiContentBuilder = apiContentBuilder;
     }
 
@@ -105,10 +105,9 @@ public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType
              PropertiesToExclude.Contains(propertyType.Alias.ToLower(CultureInfo.InvariantCulture))) == false)
         {
             IPublishedContent? content;
-            IPublishedSnapshot publishedSnapshot = _publishedSnapshotAccessor.GetRequiredPublishedSnapshot();
             if (inter is int id)
             {
-                content = publishedSnapshot.Content?.GetById(id);
+                content = _publishedContentCache.GetById(id);
                 if (content != null)
                 {
                     return content;
@@ -121,7 +120,7 @@ public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType
                     return null;
                 }
 
-                content = publishedSnapshot.Content?.GetById(udi.Guid);
+                content = _publishedContentCache.GetById(udi.Guid);
                 if (content != null && content.ContentType.ItemType == PublishedItemType.Content)
                 {
                     return content;

src/Umbraco.Core/PublishedCache/ICacheManager.cs

@@ -0,0 +1,37 @@
+using Umbraco.Cms.Core.Cache;
+
+namespace Umbraco.Cms.Core.PublishedCache;
+
+public interface ICacheManager
+{
+    /// <summary>
+    ///     Gets the <see cref="IPublishedContentCache" />.
+    /// </summary>
+    IPublishedContentCache Content { get; }
+
+    /// <summary>
+    ///     Gets the <see cref="IPublishedMediaCache" />.
+    /// </summary>
+    IPublishedMediaCache Media { get; }
+
+    /// <summary>
+    ///     Gets the <see cref="IPublishedMemberCache" />.
+    /// </summary>
+    IPublishedMemberCache Members { get; }
+
+    /// <summary>
+    ///     Gets the <see cref="IDomainCache" />.
+    /// </summary>
+    IDomainCache Domains { get; }
+
+    /// <summary>
+    ///     Gets the elements-level cache.
+    /// </summary>
+    /// <remarks>
+    ///     <para>
+    ///         The elements-level cache is shared by all snapshots relying on the same elements,
+    ///         ie all snapshots built on top of unchanging content / media / etc.
+    ///     </para>
+    /// </remarks>
+    IAppCache ElementsCache { get; }
+}

src/Umbraco.Core/PublishedCache/IDomainCacheService.cs

@@ -0,0 +1,31 @@
+using Umbraco.Cms.Core.Cache;
+using Umbraco.Cms.Core.Routing;
+
+namespace Umbraco.Cms.Core.PublishedCache;
+
+public interface IDomainCacheService
+{
+    /// <summary>
+    ///     Gets all <see cref="Domain" /> in the current domain cache, including any domains that may be referenced by
+    ///     documents that are no longer published.
+    /// </summary>
+    /// <param name="includeWildcards"></param>
+    /// <returns></returns>
+    IEnumerable<Domain> GetAll(bool includeWildcards);
+
+    /// <summary>
+    ///     Gets all assigned <see cref="Domain" /> for specified document, even if it is not published.
+    /// </summary>
+    /// <param name="documentId">The document identifier.</param>
+    /// <param name="includeWildcards">A value indicating whether to consider wildcard domains.</param>
+    IEnumerable<Domain> GetAssigned(int documentId, bool includeWildcards = false);
+
+    /// <summary>
+    ///     Determines whether a document has domains.
+    /// </summary>
+    /// <param name="documentId">The document identifier.</param>
+    /// <param name="includeWildcards">A value indicating whether to consider wildcard domains.</param>
+    bool HasAssigned(int documentId, bool includeWildcards = false);
+
+    void Refresh(DomainCacheRefresher.JsonPayload[] payloads);
+}