Merge branch '5.1.x'

Author: fredericDelaporte

appveyor.yml

@@ -1,4 +1,4 @@
-version: 5.1.2.{build}
+version: 5.1.3.{build}
 image: Visual Studio 2017
 environment:
   matrix:

build-common/NHibernate.props

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <VersionMajor Condition="'$(VersionMajor)' == ''">5</VersionMajor>
     <VersionMinor Condition="'$(VersionMinor)' == ''">1</VersionMinor>
-    <VersionPatch Condition="'$(VersionPatch)' == ''">2</VersionPatch>
+    <VersionPatch Condition="'$(VersionPatch)' == ''">3</VersionPatch>
     <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
 
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>

build-common/common.xml

@@ -13,8 +13,8 @@
 
 	<!-- This is used only for build folder -->
 	<!-- TODO: Either remove or refactor to use NHibernate.props -->
-	<property name="project.version" value="5.1.2" overwrite="false" />
-	<property name="project.version.numeric" value="5.1.2" overwrite="false" />
+	<property name="project.version" value="5.1.3" overwrite="false" />
+	<property name="project.version.numeric" value="5.1.3" overwrite="false" />
 
 	<!-- properties used to connect to database for testing -->
 	<include buildfile="nhibernate-properties.xml" />

releasenotes.txt

@@ -1,3 +1,20 @@
+Build 5.1.3
+=============================
+
+Release notes - NHibernate - Version 5.1.3
+
+** Bug
+
+   * #1741 Fix DbType.Binary registration in DB2Dialect
+   * #1732 Dictionary failure in Loader
+   * #1730 Query cache always missed in session having altered the entities
+   * #1711 Fix static proxy serialization
+
+** Task
+
+   * #1716 Release 5.1.3
+
+
 Build 5.1.2
 =============================
 

src/NHibernate.Test/Async/NHSpecificTest/GH1730/Fixture.cs

@@ -0,0 +1,78 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by AsyncGenerator.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+using NHibernate.Cfg;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.GH1730
+{
+	using System.Threading.Tasks;
+	[TestFixture]
+	public class FixtureAsync : BugTestCase
+	{
+		protected override void Configure(Configuration configuration)
+		{
+			cfg.SetProperty(Environment.GenerateStatistics, "true");
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.CreateQuery("delete from Entity").ExecuteUpdate();
+
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public async Task HitCacheInSameSessionAsync()
+		{
+			await (Sfi.EvictQueriesAsync());
+			Sfi.Statistics.Clear();
+			var entities = new System.Collections.Generic.List<Entity>();
+
+			using (var session = OpenSession())
+			{
+				using (var transaction = session.BeginTransaction())
+				{
+					for (int i = 0; i < 3; i++)
+					{
+						var e = new Entity { Name = "Name" + i };
+						entities.Add(e);
+						await (session.SaveAsync(e));
+					}
+					await (transaction.CommitAsync());
+				}
+
+				var queryString = "from Entity";
+
+				using (var tx = session.BeginTransaction())
+				{
+					// this query will hit the database and create the cache
+					await (session.CreateQuery(queryString).SetCacheable(true).ListAsync());
+					await (tx.CommitAsync());
+				}
+
+				using (var transaction = session.BeginTransaction())
+				{
+					//and this one SHOULD served by the cache
+					await (session.CreateQuery(queryString).SetCacheable(true).ListAsync());
+					await (transaction.CommitAsync());
+				}
+
+				var qs = Sfi.Statistics.GetQueryStatistics(queryString);
+				Assert.AreEqual(1, qs.CacheHitCount);
+				Assert.AreEqual(1, qs.CachePutCount);
+			}
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/GH1730/Entity.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.GH1730
+{
+	class Entity
+	{
+		public virtual Guid Id { get; set; }
+		public virtual string Name { get; set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/GH1730/Fixture.cs

@@ -0,0 +1,67 @@
+using NHibernate.Cfg;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.GH1730
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		protected override void Configure(Configuration configuration)
+		{
+			cfg.SetProperty(Environment.GenerateStatistics, "true");
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.CreateQuery("delete from Entity").ExecuteUpdate();
+
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public void HitCacheInSameSession()
+		{
+			Sfi.EvictQueries();
+			Sfi.Statistics.Clear();
+			var entities = new System.Collections.Generic.List<Entity>();
+
+			using (var session = OpenSession())
+			{
+				using (var transaction = session.BeginTransaction())
+				{
+					for (int i = 0; i < 3; i++)
+					{
+						var e = new Entity { Name = "Name" + i };
+						entities.Add(e);
+						session.Save(e);
+					}
+					transaction.Commit();
+				}
+
+				var queryString = "from Entity";
+
+				using (var tx = session.BeginTransaction())
+				{
+					// this query will hit the database and create the cache
+					session.CreateQuery(queryString).SetCacheable(true).List();
+					tx.Commit();
+				}
+
+				using (var transaction = session.BeginTransaction())
+				{
+					//and this one SHOULD served by the cache
+					session.CreateQuery(queryString).SetCacheable(true).List();
+					transaction.Commit();
+				}
+
+				var qs = Sfi.Statistics.GetQueryStatistics(queryString);
+				Assert.AreEqual(1, qs.CacheHitCount);
+				Assert.AreEqual(1, qs.CachePutCount);
+			}
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/GH1730/Mappings.hbm.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.GH1730">
+
+  <class name="Entity">
+    <id name="Id" generator="guid.comb"/>
+    <property name="Name"/>
+  </class>
+
+</hibernate-mapping>

src/NHibernate.Test/StaticProxyTest/StaticProxyFactoryFixture.cs

@@ -42,6 +42,12 @@ public class PublicInterfaceTestClass : IPublic
 			public virtual int Id { get; set; }
 		}
 
+		[Serializable]
+		public class SimpleTestClass
+		{
+			public virtual int Id { get; set; }
+		}
+
 		[Serializable]
 		public class CustomSerializationClass : ISerializable
 		{
@@ -135,6 +141,58 @@ public void VerifyProxyForClassWithAdditionalInterface()
 #endif
 		}
 
+		[Test]
+		public void InitializedProxyStaysInitializedAfterDeserialization()
+		{
+			var factory = new StaticProxyFactory();
+			factory.PostInstantiate(typeof(SimpleTestClass).FullName, typeof(SimpleTestClass), new HashSet<System.Type> {typeof(INHibernateProxy)}, null, null, null);
+			var proxy = factory.GetProxy(2, null);
+			Assert.That(proxy, Is.Not.Null, "proxy");
+			Assert.That(NHibernateUtil.IsInitialized(proxy), Is.False, "proxy already initialized after creation");
+			Assert.That(proxy.HibernateLazyInitializer, Is.Not.Null, "HibernateLazyInitializer");
+
+			var impl = new SimpleTestClass { Id = 2 };
+			proxy.HibernateLazyInitializer.SetImplementation(impl);
+			Assert.That(NHibernateUtil.IsInitialized(proxy), Is.True, "proxy not initialized after setting implementation");
+
+			var serializer = GetFormatter();
+			object deserialized;
+			using (var memoryStream = new MemoryStream())
+			{
+				serializer.Serialize(memoryStream, proxy);
+				memoryStream.Seek(0L, SeekOrigin.Begin);
+				deserialized = serializer.Deserialize(memoryStream);
+			}
+			Assert.That(deserialized, Is.Not.Null, "deserialized");
+			Assert.That(deserialized, Is.InstanceOf<INHibernateProxy>());
+			Assert.That(NHibernateUtil.IsInitialized(deserialized), Is.True, "proxy no more initialized after deserialization");
+			Assert.That(deserialized, Is.InstanceOf<SimpleTestClass>());
+			Assert.That(((SimpleTestClass) deserialized).Id, Is.EqualTo(2));
+		}
+
+		[Test]
+		public void NonInitializedProxyStaysNonInitializedAfterSerialization()
+		{
+			var factory = new StaticProxyFactory();
+			factory.PostInstantiate(typeof(SimpleTestClass).FullName, typeof(SimpleTestClass), new HashSet<System.Type> {typeof(INHibernateProxy)}, null, null, null);
+			var proxy = factory.GetProxy(2, null);
+			Assert.That(proxy, Is.Not.Null, "proxy");
+			Assert.That(NHibernateUtil.IsInitialized(proxy), Is.False, "proxy already initialized after creation");
+
+			var serializer = GetFormatter();
+			object deserialized;
+			using (var memoryStream = new MemoryStream())
+			{
+				serializer.Serialize(memoryStream, proxy);
+				Assert.That(NHibernateUtil.IsInitialized(proxy), Is.False, "proxy initialized after serialization");
+				memoryStream.Seek(0L, SeekOrigin.Begin);
+				deserialized = serializer.Deserialize(memoryStream);
+			}
+			Assert.That(deserialized, Is.Not.Null, "deserialized");
+			Assert.That(deserialized, Is.InstanceOf<INHibernateProxy>());
+			Assert.That(NHibernateUtil.IsInitialized(deserialized), Is.False, "proxy initialized after deserialization");
+		}
+
 		[Test]
 		public void CanSerializeFieldInterceptorProxy()
 		{

src/NHibernate/Async/Cache/StandardQueryCache.cs

@@ -41,7 +41,7 @@ public async Task<bool> PutAsync(QueryKey key, ICacheAssembler[] returnTypes, IL
 			if (isNaturalKeyLookup && result.Count == 0)
 				return false;
 
-			long ts = session.Timestamp;
+			long ts = session.Factory.Settings.CacheProvider.NextTimestamp();
 
 			if (Log.IsDebugEnabled())
 				Log.Debug("caching query results in region: '{0}'; {1}", _regionName, key);

src/NHibernate/Async/Loader/Loader.cs

@@ -10,6 +10,7 @@
 
 using System;
 using System.Collections;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;

src/NHibernate/Cache/StandardQueryCache.cs

@@ -60,7 +60,7 @@ public bool Put(QueryKey key, ICacheAssembler[] returnTypes, IList result, bool
 			if (isNaturalKeyLookup && result.Count == 0)
 				return false;
 
-			long ts = session.Timestamp;
+			long ts = session.Factory.Settings.CacheProvider.NextTimestamp();
 
 			if (Log.IsDebugEnabled())
 				Log.Debug("caching query results in region: '{0}'; {1}", _regionName, key);

src/NHibernate/Dialect/DB2Dialect.cs

@@ -32,6 +32,7 @@ public DB2Dialect()
 			RegisterColumnType(DbType.AnsiString, "VARCHAR(254)");
 			RegisterColumnType(DbType.AnsiString, 8000, "VARCHAR($l)");
 			RegisterColumnType(DbType.AnsiString, 2147483647, "CLOB");
+			RegisterColumnType(DbType.Binary, "BLOB");
 			RegisterColumnType(DbType.Binary, 2147483647, "BLOB");
 			RegisterColumnType(DbType.Boolean, "SMALLINT");
 			RegisterColumnType(DbType.Byte, "SMALLINT");

src/NHibernate/Loader/Loader.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
@@ -31,17 +32,21 @@ namespace NHibernate.Loader
 	/// Abstract superclass of object loading (and querying) strategies.
 	/// </summary>
 	/// <remarks>
-	/// <p>
+	/// <para>
 	/// This class implements useful common functionality that concrete loaders would delegate to.
 	/// It is not intended that this functionality would be directly accessed by client code (Hence,
 	/// all methods of this class are declared <c>protected</c> or <c>private</c>.) This class relies heavily upon the
-	/// <see cref="ILoadable" /> interface, which is the contract between this class and 
+	/// <see cref="ILoadable" /> interface, which is the contract between this class and
 	/// <see cref="IEntityPersister" />s that may be loaded by it.
-	/// </p>
-	/// <p>
-	/// The present implementation is able to load any number of columns of entities and at most 
+	/// </para>
+	/// <para>
+	/// The present implementation is able to load any number of columns of entities and at most
 	/// one collection role per query.
-	/// </p>
+	/// </para>
+	/// <para>
+	/// All this class members are thread safe. Entity and collection loaders are held in persisters shared among
+	/// sessions built from the same session factory. They must be thread safe.
+	/// </para>
 	/// </remarks>
 	/// <seealso cref="NHibernate.Persister.Entity.ILoadable"/>
 	public abstract partial class Loader
@@ -63,8 +68,8 @@ public abstract partial class Loader
 		/// <summary>
 		/// Caches subclass entity aliases for given persister index in <see cref="EntityPersisters"/>  and subclass entity name
 		/// </summary>
-		private readonly Dictionary<Tuple<int, string>, string[][]> _subclassEntityAliasesMap = new Dictionary<Tuple<int, string>, string[][]>();
-			
+		private readonly ConcurrentDictionary<Tuple<int, string>, string[][]> _subclassEntityAliasesMap = new ConcurrentDictionary<Tuple<int, string>, string[][]>();
+
 		protected Loader(ISessionFactoryImplementor factory)
 		{
 			_factory = factory;
@@ -1128,14 +1133,9 @@ private void LoadFromResultSet(DbDataReader rs, int i, object obj, string instan
 		private string[][] GetSubclassEntityAliases(int i, ILoadable persister)
 		{
 			var cacheKey = System.Tuple.Create(i, persister.EntityName);
-			if (_subclassEntityAliasesMap.TryGetValue(cacheKey, out string[][] cols))
-			{
-				return cols;
-			}
-
-			cols = EntityAliases[i].GetSuffixedPropertyAliases(persister);
-			_subclassEntityAliasesMap[cacheKey] = cols;
-			return cols;
+			return _subclassEntityAliasesMap.GetOrAdd(
+				cacheKey,
+				k => EntityAliases[i].GetSuffixedPropertyAliases(persister));
 		}
 
 		/// <summary>