lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Improve performance of GetFeaturesThatNeedUpdate

Browse Source 
This improves (~25%) the response time of _every_ admin page,
as the GetFeaturesThatNeedUpdate method is called once per page
to figure out if an admin notification should be displayed
about features needed to update.

There were 2 issues:
1. Using (and compiling) a regular expression is expensive to match
   a simple "UpdateFrom[n]" pattern.
2. Reading each row of the data migration table is more expensive than
   reading everything in one shot (the number of rows is alway going to be
   small, as there is one row per feature)

--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-11-30 23:20:19 -08:00
parent 9d7d2d5b12
commit 7b14eced5b
1 changed files with 23 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/Orchard/Data/Migration/DataMigrationManager.cs
View File

@@ -2,13 +2,11 @@
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text.RegularExpressions;
using Orchard.ContentManagement.MetaData;
using Orchard.Data.Migration.Interpreters;
using Orchard.Data.Migration.Records;
using Orchard.Data.Migration.Schema;
using Orchard.Environment.Extensions;
using Orchard.Environment.State;
using Orchard.Localization;
using Orchard.Logging;
@@ -41,38 +39,17 @@ namespace Orchard.Data.Migration {
public ILogger Logger { get; set; }
public IEnumerable<string> GetFeaturesThatNeedUpdate() {
var currentVersions = _dataMigrationRepository.Table.ToDictionary(r => r.DataMigrationClass);
var features = new List<string>();
var outOfDateMigrations = _dataMigrations.Where(dataMigration => {
DataMigrationRecord record;
if (currentVersions.TryGetValue(dataMigration.GetType().FullName, out record))
return CreateUpgradeLookupTable(dataMigration).ContainsKey(record.Version);
// compare current version and available migration methods for each migration class
foreach ( var dataMigration in _dataMigrations ) {
return (GetCreateMethod(dataMigration) != null);
});
// get current version for this migration
var dataMigrationRecord = GetDataMigrationRecord(dataMigration);
var current = 0;
if (dataMigrationRecord != null) {
current = dataMigrationRecord.Version;
}
// do we need to call Create() ?
if (current == 0) {
// try to resolve a Create method
if ( GetCreateMethod(dataMigration) != null ) {
features.Add(dataMigration.Feature.Descriptor.Id);
continue;
}
}
var lookupTable = CreateUpgradeLookupTable(dataMigration);
if(lookupTable.ContainsKey(current)) {
features.Add(dataMigration.Feature.Descriptor.Id);
}
}
return features;
return outOfDateMigrations.Select(m => m.Feature.Descriptor.Id).ToList();
}
public void Update(IEnumerable<string> features) {
@@ -206,20 +183,26 @@ namespace Orchard.Data.Migration {
/// Create a list of all available Update methods from a data migration class, indexed by the version number
/// </summary>
private static Dictionary<int, MethodInfo> CreateUpgradeLookupTable(IDataMigration dataMigration) {
var updateMethodNameRegex = new Regex(@"^UpdateFrom(?<version>\d+)$", RegexOptions.Compiled);
return dataMigration
.GetType()
.GetMethods(BindingFlags.Public | BindingFlags.Instance)
.Select(mi => GetUpdateMethod(mi))
.Where(tuple => tuple != null)
.ToDictionary(tuple => tuple.Item1, tuple => tuple.Item2);
}
// update methods might also be called after Create()
var lookupTable = new Dictionary<int, MethodInfo>();
private static Tuple<int, MethodInfo> GetUpdateMethod(MethodInfo mi) {
const string updatefromPrefix = "UpdateFrom";
// construct a lookup table with all managed initial versions
foreach ( var methodInfo in dataMigration.GetType().GetMethods(BindingFlags.Public | BindingFlags.Instance) ) {
var match = updateMethodNameRegex.Match(methodInfo.Name);
if ( match.Success ) {
lookupTable.Add(int.Parse(match.Groups["version"].Value), methodInfo);
if (mi.Name.StartsWith(updatefromPrefix)) {
var version = mi.Name.Substring(updatefromPrefix.Length);
int versionValue;
if (int.TryParse(version, out versionValue)) {
return new Tuple<int, MethodInfo>(versionValue, mi);
}
}
return lookupTable;
return null;
}
/// <summary>