Skip to content

NameBuilder concurrency issue fix #5

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 3 commits into from
Feb 7, 2020
Merged

NameBuilder concurrency issue fix #5

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8454b3
NameBuilder concurrency issue fix
AlexUstinov Jan 28, 2020
7c6a88e
Merge branch 'master' into name-builder-concurrency-issue
AlexUstinov Feb 7, 2020
8ef08cb
Fixes after code review #1
AlexUstinov Feb 7, 2020
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
28 changes: 9 additions & 19 deletions Orm/Xtensive.Orm/Orm/Providers/NameBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
// Created: 2007.08.27

using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Security.Cryptography;
using System.Text;
using Xtensive.Core;
Expand Down Expand Up @@ -36,12 +38,15 @@ public sealed class NameBuilder
private const string ReferenceForeignKeyFormat = "FK_{0}_{1}_{2}";
private const string HierarchyForeignKeyFormat = "FK_{0}_{1}";

private readonly Dictionary<Pair<Type, string>, string> fieldNameCache = new Dictionary<Pair<Type, string>, string>();
private readonly object _lock = new object();
private static readonly Func<PropertyInfo, string> fieldNameCacheValueFactory =
field => field.GetAttribute<OverrideFieldNameAttribute>()?.Name ?? field.Name;

private readonly int maxIdentifierLength;
private readonly NamingConvention namingConvention;
private readonly bool isMultidatabase;
private readonly string defaultDatabase;
private readonly ConcurrentDictionary<PropertyInfo, string> fieldNameCache =
new ConcurrentDictionary<PropertyInfo, string>();

/// <summary>
/// Gets the <see cref="Entity.TypeId"/> column name.
Expand Down Expand Up @@ -181,24 +186,9 @@ public string BuildFieldName(FieldDef field)
return result;
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
private string BuildFieldNameInternal(PropertyInfo propertyInfo)
{
var key = new Pair<Type, string>(propertyInfo.ReflectedType, propertyInfo.Name);

lock (fieldNameCache) {
string result;
if (fieldNameCache.TryGetValue(key, out result))
return result;
var attribute = propertyInfo.GetAttribute<OverrideFieldNameAttribute>();
if (attribute!=null) {
result = attribute.Name;
fieldNameCache.Add(key, result);
return result;
}
}

return propertyInfo.Name;
}
=> fieldNameCache.GetOrAdd(propertyInfo, fieldNameCacheValueFactory);

/// <summary>
/// Builds the name of the field.
Expand Down