NH-3885 - Replace ThreadSafeDictionary wrapper

with Framework's ConcurrentDictionary.

Author: ngbrown

src/NHibernate.Test/UtilityTest/ThreadSafeDictionaryFixture.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Threading;
 using log4net;
@@ -100,10 +101,10 @@ public void MultiThreadAccess()
 			   	   	},
 					};
 			MultiThreadRunner<IDictionary<int, int>> mtr = new MultiThreadRunner<IDictionary<int, int>>(20, actions);
-			IDictionary<int, int> wrapper = new ThreadSafeDictionary<int, int>(new Dictionary<int, int>());
+			IDictionary<int, int> wrapper = new ConcurrentDictionary<int, int>();
 			mtr.EndTimeout = 2000;
 			mtr.Run(wrapper);
 			log.DebugFormat("{0} reads, {1} writes -- elements {2}", read, write, wrapper.Count);
 		}
 	}
-}
+}

src/NHibernate/Impl/SessionFactoryImpl.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
@@ -93,8 +94,8 @@ public void HandleEntityNotFound(string entityName, object id)
 		private static readonly IIdentifierGenerator UuidGenerator = new UUIDHexGenerator();
 
 		[NonSerialized]
-		private readonly ThreadSafeDictionary<string, ICache> allCacheRegions =
-			new ThreadSafeDictionary<string, ICache>(new Dictionary<string, ICache>());
+		private readonly ConcurrentDictionary<string, ICache> allCacheRegions =
+			new ConcurrentDictionary<string, ICache>();
 
 		[NonSerialized]
 		private readonly IDictionary<string, IClassMetadata> classMetadata;
@@ -147,7 +148,7 @@ public void HandleEntityNotFound(string entityName, object id)
 		private readonly IQueryCache queryCache;
 
 		[NonSerialized]
-		private readonly IDictionary<string, IQueryCache> queryCaches;
+		private readonly ConcurrentDictionary<string, IQueryCache> queryCaches;
 		[NonSerialized]
 		private readonly SchemaExport schemaExport;
 		[NonSerialized]
@@ -160,7 +161,7 @@ public void HandleEntityNotFound(string entityName, object id)
 		[NonSerialized]
 		private readonly UpdateTimestampsCache updateTimestampsCache;
 		[NonSerialized]
-		private readonly IDictionary<string, string[]> entityNameImplementorsMap = new ThreadSafeDictionary<string, string[]>(new Dictionary<string, string[]>(100));
+		private readonly IDictionary<string, string[]> entityNameImplementorsMap = new ConcurrentDictionary<string, string[]>(4 * System.Environment.ProcessorCount, 100);
 		private readonly string uuid;
 		private bool disposed;
 
@@ -247,7 +248,7 @@ public SessionFactoryImpl(Configuration cfg, IMapping mapping, Settings settings
 					if (cache != null)
 					{
 						caches.Add(cacheRegion, cache);
-						allCacheRegions.Add(cache.RegionName, cache.Cache);
+						((IDictionary<string, ICache>)allCacheRegions).Add(cache.RegionName, cache.Cache);
 					}
 				}
 				IEntityPersister cp = PersisterFactory.CreateClassPersister(model, cache, this, mapping);
@@ -375,7 +376,7 @@ public SessionFactoryImpl(Configuration cfg, IMapping mapping, Settings settings
 			{
 				updateTimestampsCache = new UpdateTimestampsCache(settings, properties);
 				queryCache = settings.QueryCacheFactory.GetQueryCache(null, updateTimestampsCache, settings, properties);
-				queryCaches = new ThreadSafeDictionary<string, IQueryCache>(new Dictionary<string, IQueryCache>());
+				queryCaches = new ConcurrentDictionary<string, IQueryCache>();
 			}
 			else
 			{
@@ -967,10 +968,7 @@ public UpdateTimestampsCache UpdateTimestampsCache
 
 		public IDictionary<string, ICache> GetAllSecondLevelCacheRegions()
 		{
-			lock (allCacheRegions.SyncRoot)
-			{
-				return new Dictionary<string, ICache>(allCacheRegions);
-			}
+			return allCacheRegions.ToDictionary(kv => kv.Key, kv => kv.Value);
 		}
 
 		public ICache GetSecondLevelCacheRegion(string regionName)
@@ -1002,18 +1000,14 @@ public IQueryCache GetQueryCache(string cacheRegion)
 				return null;
 			}
 
-			lock (allCacheRegions.SyncRoot)
-			{
-				IQueryCache currentQueryCache;
-				if (!queryCaches.TryGetValue(cacheRegion, out currentQueryCache))
+			return queryCaches.GetOrAdd(
+				cacheRegion,
+				cr =>
 				{
-					currentQueryCache =
-						settings.QueryCacheFactory.GetQueryCache(cacheRegion, updateTimestampsCache, settings, properties);
-					queryCaches[cacheRegion] = currentQueryCache;
+					IQueryCache currentQueryCache = settings.QueryCacheFactory.GetQueryCache(cacheRegion, updateTimestampsCache, settings, properties);
 					allCacheRegions[currentQueryCache.RegionName] = currentQueryCache.Cache;
-				}
-				return currentQueryCache;
-			}
+					return currentQueryCache;
+				});
 		}
 
 		public void EvictQueries()
@@ -1277,4 +1271,4 @@ public string Uuid
 
 		#endregion
 	}
-}
+}

src/NHibernate/NHibernate.csproj

@@ -1783,7 +1783,6 @@
     <Compile Include="Util\SimpleMRUCache.cs" />
     <Compile Include="Util\SingletonEnumerable.cs" />
     <Compile Include="Util\SoftLimitMRUCache.cs" />
-    <Compile Include="Util\ThreadSafeDictionary.cs" />
     <Compile Include="Util\TypeNameParser.cs" />
     <Compile Include="Util\UnmodifiableDictionary.cs" />
     <Compile Include="Util\WeakHashtable.cs" />

src/NHibernate/Proxy/DynamicProxy/ProxyCache.cs

@@ -6,14 +6,15 @@
 
 #endregion
 
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using NHibernate.Util;
 
 namespace NHibernate.Proxy.DynamicProxy
 {
 	public class ProxyCache : IProxyCache
 	{
-		private static readonly IDictionary<ProxyCacheEntry, System.Type> cache = new ThreadSafeDictionary<ProxyCacheEntry, System.Type>(new Dictionary<ProxyCacheEntry, System.Type>());
+		private static readonly IDictionary<ProxyCacheEntry, System.Type> cache = new ConcurrentDictionary<ProxyCacheEntry, System.Type>();
 
 		#region IProxyCache Members
 
@@ -53,4 +54,4 @@ public void StoreProxyType(System.Type result, System.Type baseType, params Syst
 
 		#endregion
 	}
-}
+}

src/NHibernate/SqlTypes/SqlTypeFactory.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Data;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
@@ -15,7 +16,7 @@ public static class SqlTypeFactory
 		// key = typeof(sqlType).Name : ie - BinarySqlType(l), BooleanSqlType, DecimalSqlType(p,s)
 		// value = SqlType
 		private static readonly IDictionary<string, SqlType> SqlTypes = 
-			new ThreadSafeDictionary<string, SqlType>(new Dictionary<string, SqlType>(128));
+			new ConcurrentDictionary<string, SqlType>(4 * System.Environment.ProcessorCount, 128);
 
 		public static readonly SqlType Guid = new SqlType(DbType.Guid);
 		public static readonly SqlType Boolean = new SqlType(DbType.Boolean);
@@ -112,4 +113,4 @@ private static string GetKeyForPrecisionScaleBased(string name, byte precision,
 			return name + "(" + precision + ", " + scale + ")";
 		}
 	}
-}
+}

src/NHibernate/Type/TypeFactory.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Reflection;
@@ -61,13 +62,13 @@ private enum TypeClassification
 		 */
 
 		private static readonly IDictionary<string, IType> typeByTypeOfName =
-			new ThreadSafeDictionary<string, IType>(new Dictionary<string, IType>());
+			new ConcurrentDictionary<string, IType>();
 
 		private static readonly IDictionary<string, GetNullableTypeWithLength> getTypeDelegatesWithLength =
-			new ThreadSafeDictionary<string, GetNullableTypeWithLength>(new Dictionary<string, GetNullableTypeWithLength>());
+			new ConcurrentDictionary<string, GetNullableTypeWithLength>();
 
 		private static readonly IDictionary<string, GetNullableTypeWithPrecision> getTypeDelegatesWithPrecision =
-			new ThreadSafeDictionary<string, GetNullableTypeWithPrecision>(new Dictionary<string, GetNullableTypeWithPrecision>());
+			new ConcurrentDictionary<string, GetNullableTypeWithPrecision>();
 
 		private delegate NullableType GetNullableTypeWithLength(int length); // Func<int, NullableType>