#18317: Improving Import performance

Work Item: 18317

--HG--
branch : 1.x

src/Orchard/ContentManagement/DefaultHqlQuery.cs

@@ -403,7 +403,8 @@ namespace Orchard.ContentManagement {
         }
 
         public IAliasFactory ContentItemVersion() {
-            return Named("civ");
+            Current = _query.BindItemVersionCriteria();
+            return this;
         }
 
         public IAliasFactory ContentType() {

src/Orchard/ContentManagement/ImportContentSession.cs

@@ -1,41 +1,76 @@
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Orchard.ContentManagement {
     // Maps content identities to content items on the importer.
     public class ImportContentSession {
         private readonly IContentManager _contentManager;
+        private const int BulkPage = 128;
+        private int _lastIndex = 0;
 
-        private readonly Dictionary<ContentIdentity, ContentItem> _dictionary;
+        private readonly Dictionary<ContentIdentity, ContentItem> _identities;
+        private readonly Dictionary<int, ContentIdentity> _contentItemIds;
 
         public ImportContentSession(IContentManager contentManager) {
             _contentManager = contentManager;
-            _dictionary = new Dictionary<ContentIdentity, ContentItem>(new ContentIdentity.ContentIdentityEqualityComparer());
+            _identities = new Dictionary<ContentIdentity, ContentItem>(new ContentIdentity.ContentIdentityEqualityComparer());
+            _contentItemIds = new Dictionary<int, ContentIdentity>();
         }
 
         public ContentItem Get(string id) {
             var contentIdentity = new ContentIdentity(id);
 
-            if (_dictionary.ContainsKey(contentIdentity))
+            // lookup in local cache
-                return _dictionary[contentIdentity];
+            if (_identities.ContainsKey(contentIdentity))
+                return _identities[contentIdentity];
 
-            foreach (var item in _contentManager.Query(VersionOptions.Latest).List()) {
+            // no result ? then check if there are some more content items to load from the db
-                var identity = _contentManager.GetItemMetadata(item).Identity;
+
-                var equalityComparer = new ContentIdentity.ContentIdentityEqualityComparer();
+            if(_lastIndex == int.MaxValue) {
-                if (equalityComparer.Equals(identity, contentIdentity)) {
+                // everything has already been loaded from db
-                    _dictionary.Add(identity, item);
+                return null;
-                    return item;
-                }
             }
 
+            var equalityComparer = new ContentIdentity.ContentIdentityEqualityComparer();
+            IEnumerable<ContentItem> block;
+            
+            // load identities in blocks
+            while ((block = _contentManager.HqlQuery()
+                .ForVersion(VersionOptions.Latest)
+                .OrderBy(x => x.ContentItemVersion(), x => x.Asc("Id"))
+                .Slice(_lastIndex, BulkPage)).Any()) {
+
+                    foreach (var item in block) {
+                        _lastIndex++;
+
+                        // ignore content item if it has already been imported
+                        if(_contentItemIds.ContainsKey(item.Id)) {
+                            continue;
+                        }
+
+                        var identity = _contentManager.GetItemMetadata(item).Identity;
+                        
+                        _identities.Add(identity, item);
+                        _contentItemIds.Add(item.Id, identity);
+                        
+                        if (equalityComparer.Equals(identity, contentIdentity)) {
+                            return item;
+                        }
+                    }
+            }
+
+            _lastIndex = int.MaxValue;
             return null;
         }
 
         public void Store(string id, ContentItem item) {
             var contentIdentity = new ContentIdentity(id);
-            if (_dictionary.ContainsKey(contentIdentity)) {
+            if (_identities.ContainsKey(contentIdentity)) {
-                _dictionary.Remove(contentIdentity);
+                _identities.Remove(contentIdentity);
+                _contentItemIds.Remove(item.Id);
             }
-            _dictionary.Add(contentIdentity, item);
+            _identities.Add(contentIdentity, item);
+            _contentItemIds.Add(item.Id, contentIdentity);
         }
 
     }