Improving Blogs performance

--HG--
branch : 1.x

src/Orchard.Web/Modules/Orchard.Blogs/Services/BlogPostService.cs

@@ -1,14 +1,17 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using JetBrains.Annotations;
 using Orchard.Blogs.Models;
-using Orchard.ContentManagement.Aspects;
-using Orchard.Core.Common.Models;
 using Orchard.ContentManagement;
+using Orchard.ContentManagement.Aspects;
+using Orchard.ContentManagement.MetaData;
+using Orchard.Core.Common.Models;
 using Orchard.Core.Routable.Models;
 using Orchard.Core.Routable.Services;
 using Orchard.Data;
+using Orchard.Data.Conventions;
 using Orchard.Tasks.Scheduling;
 
 namespace Orchard.Blogs.Services {
@@ -18,7 +21,11 @@ namespace Orchard.Blogs.Services {
         private readonly IRepository<BlogPartArchiveRecord> _blogArchiveRepository;
         private readonly IPublishingTaskManager _publishingTaskManager;
 
-        public BlogPostService(IContentManager contentManager, IRepository<BlogPartArchiveRecord> blogArchiveRepository, IPublishingTaskManager publishingTaskManager) {
+        public BlogPostService(
+            IContentManager contentManager, 
+            IRepository<BlogPartArchiveRecord> blogArchiveRepository, 
+            IPublishingTaskManager publishingTaskManager,
+            IContentDefinitionManager contentDefinitionManager) {
             _contentManager = contentManager;
             _blogArchiveRepository = blogArchiveRepository;
             _publishingTaskManager = publishingTaskManager;
@@ -57,7 +64,10 @@ namespace Orchard.Blogs.Services {
         }
 
         public IEnumerable<BlogPostPart> Get(BlogPart blogPart, int skip, int count, VersionOptions versionOptions) {
-            return GetBlogQuery(blogPart, versionOptions).Slice(skip, count).ToList().Select(ci => ci.As<BlogPostPart>());
+            return GetBlogQuery(blogPart, versionOptions)
+                    .Slice(skip, count)
+                    .ToList()
+                    .Select(ci => ci.As<BlogPostPart>());
         }
 
         public int PostCount(BlogPart blogPart) {
@@ -130,8 +140,11 @@ namespace Orchard.Blogs.Services {
 
         private IContentQuery<ContentItem, CommonPartRecord> GetBlogQuery(ContentPart<BlogPartRecord> blog, VersionOptions versionOptions) {
             return
-                _contentManager.Query(versionOptions, "BlogPost").Join<CommonPartRecord>().Where(
+                _contentManager.Query(versionOptions, "BlogPost")
-                    cr => cr.Container == blog.Record.ContentItemRecord).OrderByDescending(cr => cr.CreatedUtc);
+                .Join<CommonPartRecord>().Where(
+                    cr => cr.Container == blog.Record.ContentItemRecord).OrderByDescending(cr => cr.CreatedUtc)
+                .WithQueryHintsFor("BlogPost")
+                    ;
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsPartDriver.cs

@@ -19,14 +19,15 @@ namespace Orchard.Comments.Drivers {
                 return null;
 
             var commentsForCommentedContent = _commentService.GetCommentsForCommentedContent(part.ContentItem.Id);
+            Func<int> pendingCount = () => commentsForCommentedContent.Where(x => x.Status == CommentStatus.Pending).Count();
 
             return Combined(
                 ContentShape("Parts_Comments",
                     () => shapeHelper.Parts_Comments(ContentPart: part)),
                 ContentShape("Parts_Comments_Count",
-                    () => shapeHelper.Parts_Comments_Count(ContentPart: part, CommentCount: commentsForCommentedContent.Count(), PendingCount: commentsForCommentedContent.Where(x => x.Status == CommentStatus.Pending).Count())), 
+                    () => shapeHelper.Parts_Comments_Count(ContentPart: part, CommentCount: commentsForCommentedContent.Count(), PendingCount: pendingCount)), 
                 ContentShape("Parts_Comments_Count_SummaryAdmin",
-                    () => shapeHelper.Parts_Comments_Count_SummaryAdmin(ContentPart: part, CommentCount: commentsForCommentedContent.Count(), PendingCount: commentsForCommentedContent.Where(x => x.Status == CommentStatus.Pending).Count()))
+                    () => shapeHelper.Parts_Comments_Count_SummaryAdmin(ContentPart: part, CommentCount: commentsForCommentedContent.Count(), PendingCount: pendingCount))
             );
         }
 

src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comments.Count.SummaryAdmin.cshtml

@@ -1,6 +1,6 @@
 <ul class="pageStatus">
 <li>
-    @Display.CommentSummaryLinks(item: Model.ContentPart.ContentItem, count: Model.CommentCount, pendingCount: Model.PendingCount)
+    @Display.CommentSummaryLinks(item: Model.ContentPart.ContentItem, count: Model.CommentCount, pendingCount: ((Func<int>)Model.PendingCount)()))
     @T(" | ")&nbsp;
 </li>
 </ul>

src/Orchard/ContentManagement/DefaultContentQuery.cs

@@ -11,6 +11,8 @@ using Orchard.Data;
 using Orchard.Utility.Extensions;
 using NHibernate.Transform;
 using NHibernate.SqlCommand;
+using System.Reflection;
+using Orchard.Data.Conventions;
 
 namespace Orchard.ContentManagement {
     public class DefaultContentQuery : IContentQuery {
@@ -286,8 +288,31 @@ namespace Orchard.ContentManagement {
                 return criteria.GetCriteriaByPath(segment) ?? criteria.CreateCriteria(segment, JoinType.LeftOuterJoin);
             }
 
-        }
+            public IContentQuery<T, TR> WithQueryHintsFor(string contentType) {
+                var contentItem = _query.ContentManager.New(contentType);
+                var contentPartRecords = new List<string>();
+                foreach (var part in contentItem.Parts) {
+                    var partType = part.GetType().BaseType;
+                    if (partType.IsGenericType && partType.GetGenericTypeDefinition() == typeof(ContentPart<>)) {
+                        var recordType = partType.GetGenericArguments().Single();
+                        contentPartRecords.Add(recordType.Name);
 
+                        // iterate over every property seeking for [AggregateAttribute]
+                        var aggregatedMembers = recordType.GetMembers(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance)
+                            .Where(x => x.GetCustomAttributes(typeof(AggregateAttribute), false).Any())
+                            .ToList();
+
+                        if (aggregatedMembers.Any()) {
+                            foreach (var aggregatedMember in aggregatedMembers) {
+                                contentPartRecords.Add(recordType.Name + "." + aggregatedMember.Name);
+                            }
+                        }
+                    }
+                }
+
+                return WithQueryHints(new QueryHints().ExpandRecords(contentPartRecords));
+            }
+        }
     }
 
     internal static class CriteriaExtensions {

src/Orchard/ContentManagement/IContentQuery.cs

@@ -33,8 +33,6 @@ namespace Orchard.ContentManagement {
         IContentQuery<TPart, TRecord> OrderByDescending<TKey>(Expression<Func<TRecord, TKey>> keySelector);
 
         IContentQuery<TPart, TRecord> WithQueryHints(QueryHints hints);
-        
+        IContentQuery<TPart, TRecord> WithQueryHintsFor(string contentType);
     }
-
+}
-}
-