Merge branch 'master' into comp-id/master

Author: jeff-hagen

src/NHibernate.Test/Async/VersionTest/Db/DbVersionFixture.cs

@@ -52,6 +52,7 @@ public async System.Threading.Tasks.Task CollectionVersionAsync()
 			admin = await (s.GetAsync<Group>(admin.Id));
 			guy.Groups.Add(admin);
 			admin.Users.Add(guy);
+			guy.NoOptimisticLock = "changed";
 			await (t.CommitAsync());
 			s.Close();
 

src/NHibernate.Test/IdGen/GuidComb/GuidCombFixture.cs

@@ -0,0 +1,32 @@
+using System;
+using NHibernate.Id;
+using NUnit.Framework;
+
+namespace NHibernate.Test.IdGen.GuidComb;
+
+[TestFixture]
+public class GuidCombFixture
+{
+	class GuidCombGeneratorEx : GuidCombGenerator
+	{
+		public static Guid Generate(string guid, DateTime utcNow) => GenerateComb(Guid.Parse(guid), utcNow);
+	}
+
+	[Test]
+	public void CanGenerateSequentialGuid()
+	{
+		Assert.AreEqual(Guid.Parse("076a04fa-ef4e-4093-8479-b0e10103cdc5"),
+			GuidCombGeneratorEx.Generate(
+				"076a04fa-ef4e-4093-8479-8599e96f14cf",
+				new DateTime(2023, 12, 23, 15, 45, 55, DateTimeKind.Utc)),
+			"seed: 076a04fa");
+
+		Assert.AreEqual(Guid.Parse("81162ee2-a4cb-4611-9327-d61f0137e5b6"),
+		    GuidCombGeneratorEx.Generate(
+			    "81162ee2-a4cb-4611-9327-23bbda36176c",
+			    new DateTime(2050, 01, 29, 18, 55, 35, DateTimeKind.Utc)),
+			"seed: 81162ee2");
+
+	}
+	
+}

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

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

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

@@ -0,0 +1,54 @@
+using log4net;
+using NHibernate.Cfg;
+using NHibernate.Impl;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.GH3657
+{
+	[TestFixture]
+	public class Fixture
+	{
+		private static readonly ILog _log = LogManager.GetLogger(typeof(Fixture));
+		private const string TestSessionFactoryName = "TestName";
+
+		private Configuration _cfg;
+		private ISessionFactory _builtSessionFactory;
+
+		[OneTimeSetUp]
+		public void TestFixtureSetUp()
+		{
+			_cfg = TestConfigurationHelper.GetDefaultConfiguration();
+			var type = GetType();
+			_cfg.AddResource(type.Namespace + ".Mappings.hbm.xml", type.Assembly);
+			_cfg.SetProperty(Environment.SessionFactoryName, TestSessionFactoryName);
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+			_builtSessionFactory?.Dispose();
+			_builtSessionFactory = null;
+		}
+
+		private ISessionFactory SessionFactoryBuilder()
+		{
+			Assert.That(_builtSessionFactory, Is.Null, "SessionFactory was already built");
+
+			_builtSessionFactory = _cfg.BuildSessionFactory();
+			_log.Info("Successfully built session factory");
+
+			return _builtSessionFactory;
+		}
+
+		[Test]
+		public void GetOrAddTwice()
+		{
+			var factory = SessionFactoryObjectFactory.GetOrBuildNamedInstance(TestSessionFactoryName, SessionFactoryBuilder);
+			Assert.That(factory, Is.Not.Null, "Failed to get the factory once");
+
+			var factory2 = SessionFactoryObjectFactory.GetOrBuildNamedInstance(TestSessionFactoryName, SessionFactoryBuilder);
+			Assert.That(factory2, Is.Not.Null, "Failed to get the factory twice");
+			Assert.That(factory, Is.SameAs(factory2), "The two factories should be the same");
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/GH3657/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.GH3657">
+
+  <class name="Entity">
+    <id name="Id" generator="guid.comb"/>
+    <property name="Name"/>
+  </class>
+
+</hibernate-mapping>

src/NHibernate.Test/NHibernate.Test.csproj

@@ -68,7 +68,7 @@
     <PackageReference Include="NHibernate.Caches.CoreDistributedCache.Memory" Version="5.9.0" />
     <PackageReference Include="NHibernate.Caches.Util.JsonSerializer" Version="5.9.0" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.117" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.14" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0.2" />
     <PackageReference Include="NSubstitute" Version="5.1.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit.Analyzers" Version="4.2.0" />

src/NHibernate.Test/VersionTest/Db/DbVersionFixture.cs

@@ -42,6 +42,7 @@ public void CollectionVersion()
 			admin = s.Get<Group>(admin.Id);
 			guy.Groups.Add(admin);
 			admin.Users.Add(guy);
+			guy.NoOptimisticLock = "changed";
 			t.Commit();
 			s.Close();
 

src/NHibernate.Test/VersionTest/Db/User.cs

@@ -11,8 +11,10 @@ public class User
 
 		public virtual string Username { get; set; }
 
+		public virtual string NoOptimisticLock { get; set; }
+
 		public virtual ISet<Group> Groups { get; set; }
 
 		public virtual ISet<Permission> Permissions { get; set; }
 	}
-}
+}

src/NHibernate.Test/VersionTest/Db/User.hbm.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!--
     Demonstrates how to control the optimistic locking behavior
     of a collection (do changes to the collection result in
@@ -14,6 +14,7 @@
 		</id>
 		<timestamp name="Timestamp" column="ts" source="db"/>
 		<property name="Username" column="user_name" type="string" unique="true"/>
+		<property name="NoOptimisticLock" column="no_optimistic_lock" type="string" optimistic-lock="false"/>
 		<set name="Groups" table="db_vers_user_group" batch-size="9" inverse="true" optimistic-lock="true" lazy="true" cascade="none" >
 			<key column="user_id"/>
 			<many-to-many column="group_id" class="Group" lazy="false" fetch="join" />
@@ -45,4 +46,4 @@
 		<property name="Context" column="ctx" type="string"/>
 		<property name="Access" column="priv" type="string"/>
 	</class>
-</hibernate-mapping>
+</hibernate-mapping>

src/NHibernate/Async/Event/Default/DefaultFlushEntityEventListener.cs

@@ -336,33 +336,35 @@ private async Task<object> GetNextVersionAsync(FlushEntityEvent @event, Cancella
 		/// to synchronize its state to the database. Modifies the event by side-effect!
 		/// Note: this method is quite slow, avoid calling if possible!
 		/// </summary>
-		protected Task<bool> IsUpdateNecessaryAsync(FlushEntityEvent @event, CancellationToken cancellationToken)
+		protected async Task<bool> IsUpdateNecessaryAsync(FlushEntityEvent @event, CancellationToken cancellationToken)
 		{
-			if (cancellationToken.IsCancellationRequested)
-			{
-				return Task.FromCanceled<bool>(cancellationToken);
-			}
+			cancellationToken.ThrowIfCancellationRequested();
 			IEntityPersister persister = @event.EntityEntry.Persister;
 			Status status = @event.EntityEntry.Status;
 
 			if (!@event.DirtyCheckPossible)
 			{
-				return Task.FromResult<bool>(true);
+				return true;
 			}
 			else
 			{
+				// call to HasDirtyCollections must not be optimized away because of its side effect
+				bool hasDirtyCollections = await (HasDirtyCollectionsAsync(@event, persister, status, cancellationToken)).ConfigureAwait(false);
+
 				int[] dirtyProperties = @event.DirtyProperties;
-				if (dirtyProperties != null && dirtyProperties.Length != 0)
-				{
-					return Task.FromResult<bool>(true); //TODO: suck into event class
-				}
-				else
-				{
-					return HasDirtyCollectionsAsync(@event, persister, status, cancellationToken);
-				}
+				return dirtyProperties != null && dirtyProperties.Length != 0 || hasDirtyCollections;
 			}
 		}
 
+		/// <summary>
+		/// Check if there are any dirty collections.
+		/// Has a side effect of setting the HasDirtyCollection property of the event.
+		/// </summary>
+		/// <param name="event"></param>
+		/// <param name="persister"></param>
+		/// <param name="status"></param>
+		/// <param name="cancellationToken">A cancellation token that can be used to cancel the work</param>
+		/// <returns></returns>
 		private async Task<bool> HasDirtyCollectionsAsync(FlushEntityEvent @event, IEntityPersister persister, Status status, CancellationToken cancellationToken)
 		{
 			cancellationToken.ThrowIfCancellationRequested();

src/NHibernate/Async/Id/GuidCombGenerator.cs

@@ -9,6 +9,7 @@
 
 
 using System;
+using System.Diagnostics;
 using NHibernate.Engine;
 
 namespace NHibernate.Id

src/NHibernate/Criterion/EntityProjection.cs

@@ -1,11 +1,12 @@
-using System;
+using System;
 using System.Collections.Generic;
 using NHibernate.Engine;
-using NHibernate.Loader;
 using NHibernate.Loader.Criteria;
 using NHibernate.Persister.Entity;
 using NHibernate.SqlCommand;
 using NHibernate.Type;
+using NHibernate.Util;
+
 using IQueryable = NHibernate.Persister.Entity.IQueryable;
 
 namespace NHibernate.Criterion
@@ -204,7 +205,7 @@ private void SetFields(ICriteriaQuery criteriaQuery)
 				subcriteria,
 				Persister.IdentifierPropertyName ?? string.Empty);
 
-			ColumnAliasSuffix = BasicLoader.GenerateSuffix(criteriaQuery.GetIndexForAlias());
+			ColumnAliasSuffix = StringHelper.GenerateSuffix(criteriaQuery.GetIndexForAlias());
 
 			_identifierColumnAliases = Persister.GetIdentifierAliases(ColumnAliasSuffix);
 

src/NHibernate/Event/Default/DefaultFlushEntityEventListener.cs

@@ -389,18 +389,22 @@ protected bool IsUpdateNecessary(FlushEntityEvent @event)
 			}
 			else
 			{
+				// call to HasDirtyCollections must not be optimized away because of its side effect
+				bool hasDirtyCollections = HasDirtyCollections(@event, persister, status);
+
 				int[] dirtyProperties = @event.DirtyProperties;
-				if (dirtyProperties != null && dirtyProperties.Length != 0)
-				{
-					return true; //TODO: suck into event class
-				}
-				else
-				{
-					return HasDirtyCollections(@event, persister, status);
-				}
+				return dirtyProperties != null && dirtyProperties.Length != 0 || hasDirtyCollections;
 			}
 		}
 
+		/// <summary>
+		/// Check if there are any dirty collections.
+		/// Has a side effect of setting the HasDirtyCollection property of the event.
+		/// </summary>
+		/// <param name="event"></param>
+		/// <param name="persister"></param>
+		/// <param name="status"></param>
+		/// <returns></returns>
 		private bool HasDirtyCollections(FlushEntityEvent @event, IEntityPersister persister, Status status)
 		{
 			if (IsCollectionDirtyCheckNecessary(persister, status))

src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs

@@ -485,7 +485,7 @@ internal string GetSuffix(FromElement fromElement)
 				return suffix;
 			}
 
-			suffix = _suffixes.Count == 0 ? string.Empty : _suffixes.Count.ToString() + '_';
+			suffix = _suffixes.Count == 0 ? string.Empty : StringHelper.GenerateSuffix(_suffixes.Count);
 			_suffixes.Add(fromElement, suffix);
 
 			return suffix;

src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementType.cs

@@ -532,7 +532,7 @@ private static string GetSuffix(int size, int sequence)
 
 		private static string GenerateSuffix(int size, int k)
 		{
-			String suffix = size == 1 ? "" : k.ToString() + '_';
+			String suffix = size == 1 ? "" : StringHelper.GenerateSuffix(k);
 			return suffix;
 		}
 

src/NHibernate/Id/GuidCombGenerator.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using NHibernate.Engine;
 
 namespace NHibernate.Id
@@ -36,34 +37,32 @@ public partial class GuidCombGenerator : IIdentifierGenerator
 		/// <returns>The new identifier as a <see cref="Guid"/>.</returns>
 		public object Generate(ISessionImplementor session, object obj)
 		{
-			return GenerateComb();
+			return GenerateComb(Guid.NewGuid(), DateTime.UtcNow);
 		}
 
 		/// <summary>
 		/// Generate a new <see cref="Guid"/> using the comb algorithm.
 		/// </summary>
-		private Guid GenerateComb()
+		protected static Guid GenerateComb(Guid guid, DateTime utcNow)
 		{
-			byte[] guidArray = Guid.NewGuid().ToByteArray();
-
-			DateTime now = DateTime.UtcNow;
-
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER
+			Span<byte> guidArray = stackalloc byte[16];
+			guid.TryWriteBytes(guidArray);
+#else
+			var guidArray = guid.ToByteArray();
+#endif
 			// Get the days and milliseconds which will be used to build the byte string 
-			TimeSpan days = new TimeSpan(now.Ticks - BaseDateTicks);
-			TimeSpan msecs = now.TimeOfDay;
-
-			// Convert to a byte array 
+			var ts = new TimeSpan(utcNow.Ticks - BaseDateTicks);
+			var days = ts.Days;
+			guidArray[10] = (byte) (days >> 8);
+			guidArray[11] = (byte) days;
+					
 			// Note that SQL Server is accurate to 1/300th of a millisecond so we divide by 3.333333 
-			byte[] daysArray = BitConverter.GetBytes(days.Days);
-			byte[] msecsArray = BitConverter.GetBytes((long) (msecs.TotalMilliseconds / 3.333333));
-
-			// Reverse the bytes to match SQL Servers ordering 
-			Array.Reverse(daysArray);
-			Array.Reverse(msecsArray);
-
-			// Copy the bytes into the guid 
-			Array.Copy(daysArray, daysArray.Length - 2, guidArray, guidArray.Length - 6, 2);
-			Array.Copy(msecsArray, msecsArray.Length - 4, guidArray, guidArray.Length - 4, 4);
+			var msecs = (long) (utcNow.TimeOfDay.TotalMilliseconds / 3.333333);
+			guidArray[12] = (byte) (msecs >> 24);
+			guidArray[13] = (byte) (msecs >> 16);
+			guidArray[14] = (byte) (msecs >> 8);
+			guidArray[15] = (byte) msecs;
 
 			return new Guid(guidArray);
 		}