Implement breaking change minimizing suggestions

Author: fredericDelaporte

src/NHibernate.Test/Async/QueryTest/MultiCriteriaFixture.cs

@@ -153,8 +153,8 @@ public async Task CanGetMultiQueryFromSecondLevelCacheAsync()
 
 			var cacheHashtable = MultipleQueriesFixtureAsync.GetHashTableUsedAsQueryCache(Sfi);
 			var cachedListEntry = (IList)new ArrayList(cacheHashtable.Values)[0];
-			// The first element is a timestamp, the second is aliases, then only we have the cached data.
-			var cachedQuery = (IList)cachedListEntry[2] ?? throw new InvalidOperationException("Cached data is null");
+			// The first element is a timestamp, then only we have the cached data.
+			var cachedQuery = (IList) cachedListEntry[1] ?? throw new InvalidOperationException("Cached data is null");
 
 			var firstQueryResults = (IList)cachedQuery[0];
 			firstQueryResults.Clear();

src/NHibernate.Test/Async/QueryTest/MultipleMixedQueriesFixture.cs

@@ -83,8 +83,8 @@ public async Task CanGetMultiQueryFromSecondLevelCacheAsync()
 
 			var cacheHashtable = MultipleQueriesFixtureAsync.GetHashTableUsedAsQueryCache(Sfi);
 			var cachedListEntry = (IList)new ArrayList(cacheHashtable.Values)[0];
-			// The first element is a timestamp, the second is aliases, then only we have the cached data.
-			var cachedQuery = (IList) cachedListEntry[2] ?? throw new InvalidOperationException("Cached data is null");
+			// The first element is a timestamp, then only we have the cached data.
+			var cachedQuery = (IList) cachedListEntry[1] ?? throw new InvalidOperationException("Cached data is null");
 
 			var firstQueryResults = (IList)cachedQuery[0];
 			firstQueryResults.Clear();

src/NHibernate.Test/Async/QueryTest/MultipleQueriesFixture.cs

@@ -86,8 +86,8 @@ public async Task CanGetMultiQueryFromSecondLevelCacheAsync()
 
 			var cacheHashtable = GetHashTableUsedAsQueryCache(Sfi);
 			var cachedListEntry = (IList)new ArrayList(cacheHashtable.Values)[0];
-			// The first element is a timestamp, the second is aliases, then only we have the cached data.
-			var cachedQuery = (IList) cachedListEntry[2] ?? throw new InvalidOperationException("Cached data is null");
+			// The first element is a timestamp, then only we have the cached data.
+			var cachedQuery = (IList) cachedListEntry[1] ?? throw new InvalidOperationException("Cached data is null");
 
 			var firstQueryResults = (IList)cachedQuery[0];
 			firstQueryResults.Clear();

src/NHibernate.Test/QueryTest/MultiCriteriaFixture.cs

@@ -141,8 +141,8 @@ public void CanGetMultiQueryFromSecondLevelCache()
 
 			var cacheHashtable = MultipleQueriesFixture.GetHashTableUsedAsQueryCache(Sfi);
 			var cachedListEntry = (IList)new ArrayList(cacheHashtable.Values)[0];
-			// The first element is a timestamp, the second is aliases, then only we have the cached data.
-			var cachedQuery = (IList)cachedListEntry[2] ?? throw new InvalidOperationException("Cached data is null");
+			// The first element is a timestamp, then only we have the cached data.
+			var cachedQuery = (IList)cachedListEntry[1] ?? throw new InvalidOperationException("Cached data is null");
 
 			var firstQueryResults = (IList)cachedQuery[0];
 			firstQueryResults.Clear();

src/NHibernate.Test/QueryTest/MultipleMixedQueriesFixture.cs

@@ -71,8 +71,8 @@ public void CanGetMultiQueryFromSecondLevelCache()
 
 			var cacheHashtable = MultipleQueriesFixture.GetHashTableUsedAsQueryCache(Sfi);
 			var cachedListEntry = (IList)new ArrayList(cacheHashtable.Values)[0];
-			// The first element is a timestamp, the second is aliases, then only we have the cached data.
-			var cachedQuery = (IList) cachedListEntry[2] ?? throw new InvalidOperationException("Cached data is null");
+			// The first element is a timestamp, then only we have the cached data.
+			var cachedQuery = (IList) cachedListEntry[1] ?? throw new InvalidOperationException("Cached data is null");
 
 			var firstQueryResults = (IList)cachedQuery[0];
 			firstQueryResults.Clear();

src/NHibernate.Test/QueryTest/MultipleQueriesFixture.cs

@@ -74,8 +74,8 @@ public void CanGetMultiQueryFromSecondLevelCache()
 
 			var cacheHashtable = GetHashTableUsedAsQueryCache(Sfi);
 			var cachedListEntry = (IList)new ArrayList(cacheHashtable.Values)[0];
-			// The first element is a timestamp, the second is aliases, then only we have the cached data.
-			var cachedQuery = (IList) cachedListEntry[2] ?? throw new InvalidOperationException("Cached data is null");
+			// The first element is a timestamp, then only we have the cached data.
+			var cachedQuery = (IList) cachedListEntry[1] ?? throw new InvalidOperationException("Cached data is null");
 
 			var firstQueryResults = (IList)cachedQuery[0];
 			firstQueryResults.Clear();

src/NHibernate/Cache/StandardQueryCache.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using NHibernate.Cfg;
 using NHibernate.Engine;
 using NHibernate.Persister.Collection;
@@ -18,7 +17,7 @@ namespace NHibernate.Cache
 	/// </summary>
 	public partial class StandardQueryCache : IQueryCache, IBatchableQueryCache
 	{
-		private static readonly INHibernateLogger Log = NHibernateLogger.For(typeof (StandardQueryCache));
+		private static readonly INHibernateLogger Log = NHibernateLogger.For(typeof(StandardQueryCache));
 		private readonly string _regionName;
 		private readonly UpdateTimestampsCache _updateTimestampsCache;
 		private readonly CacheBase _cache;
@@ -133,7 +132,7 @@ public IList Get(
 					return null;
 				}
 
-				var timestamp = (long) cacheable[0];
+				var timestamp = GetResultsMetadata(cacheable, out var aliases);
 
 				if (Log.IsDebugEnabled())
 					Log.Debug("Checking query spaces for up-to-dateness [{0}]", StringHelper.CollectionToString(spaces));
@@ -148,7 +147,6 @@ public IList Get(
 
 				if (result != null && key.ResultTransformer?.AutoDiscoverTypes == true && result.Count > 0)
 				{
-					var aliases = (string[]) cacheable[1];
 					key.ResultTransformer.SupplyAutoDiscoveredParameters(queryParameters.ResultTransformer, aliases);
 				}
 
@@ -174,7 +172,7 @@ public IList Get(QueryKey key, ICacheAssembler[] returnTypes, bool isNaturalKeyL
 				return null;
 			}
 
-			var timestamp = (long) cacheable[0];
+			var timestamp = GetResultsMetadata(cacheable, out var _);
 
 			if (Log.IsDebugEnabled())
 				Log.Debug("Checking query spaces for up-to-dateness [{0}]", StringHelper.CollectionToString(spaces));
@@ -256,10 +254,16 @@ public IList[] GetMany(
 
 				spacesToCheck.Add(querySpaces);
 				checkedSpacesIndexes.Add(i);
-				// The timestamp is the first element of the cache result.
-				checkedSpacesTimestamp.Add((long) cacheable[0]);
+				var timestamp = GetResultsMetadata(cacheable, out var aliases);
+				checkedSpacesTimestamp.Add(timestamp);
 				if (Log.IsDebugEnabled())
 					Log.Debug("Checking query spaces for up-to-dateness [{0}]", StringHelper.CollectionToString(querySpaces));
+
+				var key = keys[i];
+				if (key.ResultTransformer?.AutoDiscoverTypes == true && HasResults(cacheable))
+				{
+					key.ResultTransformer.SupplyAutoDiscoveredParameters(queryParameters[i].ResultTransformer, aliases);
+				}
 			}
 
 			var upToDates = spacesToCheck.Count > 0
@@ -298,12 +302,6 @@ public IList[] GetMany(
 
 					finalReturnTypes[i] = GetReturnTypes(key, returnTypes[i], cacheable);
 					PerformBeforeAssemble(finalReturnTypes[i], session, cacheable);
-
-					if (key.ResultTransformer?.AutoDiscoverTypes == true && cacheable.Count > 2)
-					{
-						var aliases = (string[]) cacheable[1];
-						key.ResultTransformer.SupplyAutoDiscoveredParameters(queryParams.ResultTransformer, aliases);
-					}
 				}
 
 				for (var i = 0; i < keys.Length; i++)
@@ -374,7 +372,12 @@ private static List<object> GetCacheableResult(
 			IList result,
 			long ts, string[] aliases)
 		{
-			var cacheable = new List<object>(result.Count + 2) { ts, aliases };
+			var cacheable =
+				new List<object>(result.Count + 1)
+				{
+					aliases == null ? ts : new object[] { ts, aliases }
+				};
+
 			foreach (var row in result)
 			{
 				if (returnTypes.Length == 1)
@@ -383,19 +386,37 @@ private static List<object> GetCacheableResult(
 				}
 				else
 				{
-					cacheable.Add(TypeHelper.Disassemble((object[])row, returnTypes, null, session, null));
+					cacheable.Add(TypeHelper.Disassemble((object[]) row, returnTypes, null, session, null));
 				}
 			}
 
 			return cacheable;
 		}
 
-		private static IEnumerable<object> GetResultsEnumerable(IList results)
+		private static long GetResultsMetadata(IList cacheable, out string[] aliases)
+		{
+			aliases = null;
+
+			var metadata = cacheable[0];
+			var timestamp = metadata as long?;
+			if (timestamp.HasValue)
+				return timestamp.Value;
+
+			var metadataArray = (object[]) metadata;
+			aliases = (string[]) metadataArray[1];
+			return (long) metadataArray[0];
+		}
+
+		private static bool HasResults(IList cacheable)
+			// First element is the timestamp.
+			=> cacheable.Count > 1;
+
+		private static IEnumerable<object> GetResultsEnumerable(IList cacheable)
 		{
-			// Skip first element, it is the timestamp, and the second, it is the aliases.
-			for (var i = 2; i < results.Count; i++)
+			// Skip first element, it is the timestamp.
+			for (var i = 1; i < cacheable.Count; i++)
 			{
-				yield return results[i];
+				yield return cacheable[i];
 			}
 		}
 
@@ -404,7 +425,7 @@ private static ICacheAssembler[] GetReturnTypes(
 			ICacheAssembler[] returnTypes,
 			IList cacheable)
 		{
-			if (key.ResultTransformer?.AutoDiscoverTypes == true && cacheable.Count > 2)
+			if (key.ResultTransformer?.AutoDiscoverTypes == true && HasResults(cacheable))
 			{
 				returnTypes = GuessTypes(cacheable);
 			}