#19363: Caching content type definitions

Work Item: 19363

--HG--
branch : 1.x

src/Orchard.Tests.Modules/DatabaseEnabledTestsBase.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using Autofac;
 using NHibernate;
 using NUnit.Framework;
+using Orchard.Caching;
 using Orchard.Data;
 using Orchard.Services;
 using Orchard.Tests.Data;
@@ -47,6 +48,7 @@ namespace Orchard.Tests.Modules {
             builder.RegisterInstance(new StubLocator(_session)).As<ISessionLocator>();
             builder.RegisterInstance(_clock).As<IClock>();
             builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>));
+            builder.RegisterType<StubCacheManager>().As<ICacheManager>();
             Register(builder);
             _container = builder.Build();
 

src/Orchard.Tests.Modules/ImportExport/Services/ImportExportServiceTests.cs

@@ -66,6 +66,7 @@ namespace Orchard.Tests.Modules.ImportExport.Services {
             builder.RegisterType<StubWebSiteFolder>().As<IWebSiteFolder>();
             builder.RegisterType<CustomRecipeHandler>().As<IRecipeHandler>();
             builder.RegisterType<DefaultContentManager>().As<IContentManager>();
+            builder.RegisterType<StubCacheManager>().As<ICacheManager>();
             builder.RegisterType<ContentDefinitionManager>().As<IContentDefinitionManager>();
             builder.RegisterType<ContentDefinitionWriter>().As<IContentDefinitionWriter>();
             builder.RegisterType<StubOrchardServices>().As<IOrchardServices>();

src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs

@@ -5,6 +5,7 @@ using Autofac;
 using Moq;
 using NHibernate;
 using NUnit.Framework;
+using Orchard.Caching;
 using Orchard.ContentManagement.MetaData;
 using Orchard.ContentManagement.MetaData.Models;
 using Orchard.ContentManagement.MetaData.Services;
@@ -74,6 +75,7 @@ namespace Orchard.Tests.Modules.Users.Services {
             builder.RegisterType<DefaultContentManager>().As<IContentManager>();
             builder.RegisterType(typeof(SettingsFormatter)).As<ISettingsFormatter>();
             builder.RegisterType<ContentDefinitionManager>().As<IContentDefinitionManager>();
+            builder.RegisterType<StubCacheManager>().As<ICacheManager>();
             builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>();
             builder.RegisterType<UserPartHandler>().As<IContentHandler>();
             builder.RegisterType<StubWorkContextAccessor>().As<IWorkContextAccessor>();

src/Orchard.Tests/ContentManagement/ContentQueryTests.cs

@@ -3,6 +3,7 @@ using Autofac;
 using Moq;
 using NHibernate;
 using NUnit.Framework;
+using Orchard.Caching;
 using Orchard.ContentManagement.MetaData;
 using Orchard.Data;
 using Orchard.ContentManagement;
@@ -47,6 +48,7 @@ namespace Orchard.Tests.ContentManagement {
 
             builder.RegisterModule(new ContentModule());
             builder.RegisterType<DefaultContentManager>().As<IContentManager>().SingleInstance();
+            builder.RegisterType<StubCacheManager>().As<ICacheManager>();
             builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>();
             builder.RegisterInstance(new Mock<IContentDefinitionManager>().Object);
             builder.RegisterInstance(new Mock<IContentDisplay>().Object);

src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs

@@ -6,6 +6,7 @@ using Autofac;
 using Moq;
 using NHibernate;
 using NUnit.Framework;
+using Orchard.Caching;
 using Orchard.ContentManagement.MetaData;
 using Orchard.ContentManagement.MetaData.Builders;
 using Orchard.ContentManagement.MetaData.Models;
@@ -59,6 +60,7 @@ namespace Orchard.Tests.ContentManagement {
             var builder = new ContainerBuilder();
             builder.RegisterType<DefaultContentQuery>().As<IContentQuery>();
             builder.RegisterType<DefaultContentManager>().As<IContentManager>();
+            builder.RegisterType<StubCacheManager>().As<ICacheManager>();
             builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>();
             builder.RegisterInstance(_contentDefinitionManager.Object);
             builder.RegisterInstance(new Mock<IContentDisplay>().Object);

src/Orchard.Tests/ContentManagement/DynamicContentQueryTests.cs

@@ -3,6 +3,7 @@ using Autofac;
 using Moq;
 using NHibernate;
 using NUnit.Framework;
+using Orchard.Caching;
 using Orchard.ContentManagement.MetaData;
 using Orchard.Data;
 using Orchard.ContentManagement;
@@ -45,6 +46,7 @@ namespace Orchard.Tests.ContentManagement {
 
             builder.RegisterModule(new ContentModule());
             builder.RegisterType<DefaultContentManager>().As<IContentManager>().SingleInstance();
+            builder.RegisterType<StubCacheManager>().As<ICacheManager>();
             builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>();
             builder.RegisterInstance(new Mock<IContentDefinitionManager>().Object);
             builder.RegisterInstance(new Mock<IContentDisplay>().Object);

src/Orchard.Tests/ContentManagement/HqlExpressionTests.cs

@@ -5,6 +5,7 @@ using Autofac;
 using Moq;
 using NHibernate;
 using NUnit.Framework;
+using Orchard.Caching;
 using Orchard.ContentManagement.MetaData;
 using Orchard.Data;
 using Orchard.ContentManagement;
@@ -48,6 +49,7 @@ namespace Orchard.Tests.ContentManagement {
 
             builder.RegisterModule(new ContentModule());
             builder.RegisterType<DefaultContentManager>().As<IContentManager>().SingleInstance();
+            builder.RegisterType<StubCacheManager>().As<ICacheManager>();
             builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>();
             builder.RegisterInstance(new Mock<IContentDefinitionManager>().Object);
             builder.RegisterInstance(new Mock<IContentDisplay>().Object);

src/Orchard.Tests/Localization/CultureManagerTests.cs

@@ -45,6 +45,7 @@ namespace Orchard.Tests.Localization {
             var builder = new ContainerBuilder();
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
+            builder.RegisterType<StubCacheManager>().As<ICacheManager>();
             builder.RegisterInstance(new Mock<IContentDefinitionManager>().Object);
             builder.RegisterInstance(new Mock<ITransactionManager>().Object);
             builder.RegisterInstance(new Mock<IAuthorizer>().Object);

src/Orchard/ContentManagement/DefaultContentManager.cs

@@ -10,6 +10,7 @@ using NHibernate;
 using NHibernate.Criterion;
 using NHibernate.SqlCommand;
 using NHibernate.Transform;
+using Orchard.Caching;
 using Orchard.ContentManagement.Handlers;
 using Orchard.ContentManagement.MetaData;
 using Orchard.ContentManagement.MetaData.Builders;
@@ -27,6 +28,7 @@ namespace Orchard.ContentManagement {
         private readonly IRepository<ContentItemRecord> _contentItemRepository;
         private readonly IRepository<ContentItemVersionRecord> _contentItemVersionRepository;
         private readonly IContentDefinitionManager _contentDefinitionManager;
+        private readonly ICacheManager _cacheManager;
         private readonly Func<IContentManagerSession> _contentManagerSession;
         private readonly Lazy<IContentDisplay> _contentDisplay;
         private readonly Lazy<ISessionLocator> _sessionLocator; 
@@ -40,6 +42,7 @@ namespace Orchard.ContentManagement {
             IRepository<ContentItemRecord> contentItemRepository,
             IRepository<ContentItemVersionRecord> contentItemVersionRepository,
             IContentDefinitionManager contentDefinitionManager,
+            ICacheManager cacheManager,
             Func<IContentManagerSession> contentManagerSession,
             Lazy<IContentDisplay> contentDisplay,
             Lazy<ISessionLocator> sessionLocator,
@@ -49,6 +52,7 @@ namespace Orchard.ContentManagement {
             _contentItemRepository = contentItemRepository;
             _contentItemVersionRepository = contentItemVersionRepository;
             _contentDefinitionManager = contentDefinitionManager;
+            _cacheManager = cacheManager;
             _contentManagerSession = contentManagerSession;
             _handlers = handlers;
             _contentDisplay = contentDisplay;
@@ -661,13 +665,19 @@ namespace Orchard.ContentManagement {
         }
 
         private ContentTypeRecord AcquireContentTypeRecord(string contentType) {
-            var contentTypeRecord = _contentTypeRepository.Get(x => x.Name == contentType);
+            var contentTypeId = _cacheManager.Get(contentType + "_Record", ctx => {
-            if (contentTypeRecord == null) {
+                var contentTypeRecord = _contentTypeRepository.Get(x => x.Name == contentType);
-                //TEMP: this is not safe... ContentItem types could be created concurrently?
+
-                contentTypeRecord = new ContentTypeRecord { Name = contentType };
+                if (contentTypeRecord == null) {
-                _contentTypeRepository.Create(contentTypeRecord);
+                    //TEMP: this is not safe... ContentItem types could be created concurrently?
-            }
+                    contentTypeRecord = new ContentTypeRecord { Name = contentType };
-            return contentTypeRecord;
+                    _contentTypeRepository.Create(contentTypeRecord);
+                }
+
+                return contentTypeRecord.Id;
+            });
+
+            return _contentTypeRepository.Get(contentTypeId);
         }
 
         public void Index(ContentItem contentItem, IDocumentIndex documentIndex) {