Remove grouping of caches by type

Author: hazzik

src/NHibernate/Cache/CacheFactory.cs

@@ -41,7 +41,7 @@ public static ICacheConcurrencyStrategy CreateCache(
 		{
 			var cache = CreateCache(
 				usage, name, settings,
-				(r, u) => settings.CacheProvider.BuildCache(r, properties).AsCacheBase());
+				r => settings.CacheProvider.BuildCache(r, properties).AsCacheBase());
 
 			if (cache != null && mutable && usage == ReadOnly)
 				log.Warn("read-only cache configured for mutable: {0}", name);
@@ -61,7 +61,7 @@ public static ICacheConcurrencyStrategy CreateCache(
 			string usage,
 			string name,
 			Settings settings,
-			Func<string, string, CacheBase> regionAndUsageCacheGetter)
+			Func<string, CacheBase> regionAndUsageCacheGetter)
 		{
 			if (usage == null || !settings.IsSecondLevelCacheEnabled) return null; //no cache
 
@@ -92,7 +92,7 @@ public static ICacheConcurrencyStrategy CreateCache(
 
 			try
 			{
-				ccs.Cache = regionAndUsageCacheGetter(name, usage);
+				ccs.Cache = regionAndUsageCacheGetter(name);
 			}
 			catch (CacheException e)
 			{

src/NHibernate/Impl/SessionFactoryImpl.cs

@@ -95,8 +95,8 @@ public void HandleEntityNotFound(string entityName, object id)
 		private static readonly IIdentifierGenerator UuidGenerator = new UUIDHexGenerator();
 
 		[NonSerialized]
-		private readonly ConcurrentDictionary<string, ConcurrentDictionary<string, CacheBase>> allCachePerRegionThenType =
-			new ConcurrentDictionary<string, ConcurrentDictionary<string, CacheBase>>();
+		private readonly ConcurrentDictionary<string, CacheBase> _allCacheRegions =
+			new ConcurrentDictionary<string, CacheBase>();
 
 		[NonSerialized]
 		private readonly IDictionary<string, IClassMetadata> classMetadata;
@@ -148,8 +148,6 @@ public void HandleEntityNotFound(string entityName, object id)
 		[NonSerialized]
 		private readonly IQueryCache queryCache;
 
-		private const string QueryCacheType = "QueryCache";
-
 		[NonSerialized]
 		private readonly ConcurrentDictionary<string, Lazy<IQueryCache>> queryCaches;
 		[NonSerialized]
@@ -370,7 +368,7 @@ public SessionFactoryImpl(Configuration cfg, IMapping mapping, Settings settings
 			if (settings.IsQueryCacheEnabled)
 			{
 				var updateTimestampsCacheName = typeof(UpdateTimestampsCache).Name;
-				updateTimestampsCache = new UpdateTimestampsCache(BuildCache(updateTimestampsCacheName, updateTimestampsCacheName));
+				updateTimestampsCache = new UpdateTimestampsCache(BuildCache(updateTimestampsCacheName));
 				var queryCacheName = typeof(StandardQueryCache).FullName;
 				queryCache = BuildQueryCache(queryCacheName);
 				queryCaches = new ConcurrentDictionary<string, Lazy<IQueryCache>>();
@@ -417,7 +415,7 @@ private IQueryCache BuildQueryCache(string queryCacheName)
 				settings.QueryCacheFactory.GetQueryCache(
 					updateTimestampsCache,
 					properties,
-					BuildCache(queryCacheName, QueryCacheType))
+					BuildCache(queryCacheName))
 				// 6.0 TODO: remove the coalesce once IQueryCacheFactory todos are done
 #pragma warning disable 618
 				?? settings.QueryCacheFactory.GetQueryCache(
@@ -1071,12 +1069,11 @@ public IDictionary<string, ICache> GetAllSecondLevelCacheRegions()
 #pragma warning restore 618
 		{
 			return
-				allCachePerRegionThenType
+				_allCacheRegions
 					// ToArray creates a moment in time snapshot
 					.ToArray()
-					// Caches are not unique per region, take the first one.
 #pragma warning disable 618
-					.ToDictionary(kv => kv.Key, kv => (ICache)kv.Value.Values.First());
+					.ToDictionary(kv => kv.Key, kv => (ICache) kv.Value);
 #pragma warning restore 618
 		}
 
@@ -1085,13 +1082,11 @@ public IDictionary<string, ICache> GetAllSecondLevelCacheRegions()
 		public ICache GetSecondLevelCacheRegion(string regionName)
 #pragma warning restore 618
 		{
-			if (!allCachePerRegionThenType.TryGetValue(regionName, out var result))
-				return null;
-			// Caches are not unique per region, take the first one.
-			return result.Values.First();
+			_allCacheRegions.TryGetValue(regionName, out var result);
+			return result;
 		}
 
-		private CacheBase BuildCache(string cacheRegion, string type)
+		private CacheBase BuildCache(string cacheRegion)
 		{
 			// If run concurrently for the same region and type, this may built many caches for the same region and type.
 			// Currently only GetQueryCache may be run concurrently, and its implementation prevents
@@ -1101,15 +1096,8 @@ private CacheBase BuildCache(string cacheRegion, string type)
 			var prefix = settings.CacheRegionPrefix;
 			if (!string.IsNullOrEmpty(prefix))
 				cacheRegion = prefix + '.' + cacheRegion;
-			var cachesPerType = allCachePerRegionThenType.GetOrAdd(cacheRegion, cr => new ConcurrentDictionary<string, CacheBase>());
-			var cache = settings.CacheProvider.BuildCache(cacheRegion, properties).AsCacheBase();
-			if (!cachesPerType.TryAdd(type, cache))
-			{
-				cache.Destroy();
-				throw new InvalidOperationException($"A cache has already been built for region {cacheRegion} and type {type}.");
-			}
 
-			return cache;
+			return _allCacheRegions.GetOrAdd(cacheRegion, cr => settings.CacheProvider.BuildCache(cr, properties).AsCacheBase());
 		}
 
 		/// <summary> Statistics SPI</summary>