Skip to content

Improve Comparer.GetCommonBase method performance #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alex-kulakov merged 1 commit into from
Nov 23, 2020
Merged

Improve Comparer.GetCommonBase method performance #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions Orm/Xtensive.Orm/Modelling/Comparison/Comparer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,33 +735,33 @@ private bool TryRegisterDifference(object source, object target, Difference diff
/// <returns>The highest common base type.</returns>
protected static Type GetCommonBase(object source, object target)
{
var sourceAncestors = GetAncestors(source==null ? WellKnownTypes.Object : source.GetType());
var targetAncestors = GetAncestors(target==null ? WellKnownTypes.Object : target.GetType());
var sourceType = sourceAncestors[sourceAncestors.Count - 1];
var targetType = targetAncestors[targetAncestors.Count - 1];
if (sourceType.IsAssignableFrom(targetType))
var sourceType = source?.GetType() ?? WellKnownTypes.Object;
var targetType = target?.GetType() ?? WellKnownTypes.Object;

if (sourceType.IsAssignableFrom(targetType)) {
return targetType;
if (targetType.IsAssignableFrom(sourceType))
}

if (targetType.IsAssignableFrom(sourceType)) {
return sourceType;
var commonBase = WellKnownTypes.Object;
for (int i = 0; i < Math.Min(sourceAncestors.Count, targetAncestors.Count); i++) {
var ancestor = sourceAncestors[i];
if (ancestor!=targetAncestors[i])
break;
commonBase = ancestor;
}
return commonBase;

var sourceAncestors = GetAncestors(sourceType).ToHashSet();
foreach (var ancestorType in GetAncestors(targetType)) {
if (sourceAncestors.Contains(ancestorType)) {
return ancestorType;
}
}

return WellKnownTypes.Object;
}

private static List<Type> GetAncestors(Type type)
private static IEnumerable<Type> GetAncestors(Type type)
{
var list = new List<Type>();
while (type!=WellKnownTypes.Object) {
list.Insert(0, type);
while (type != null) {
yield return type;
type = type.BaseType;
}
list.Insert(0, WellKnownTypes.Object);
return list;
}

#endregion
Expand Down