Fix concurrency issue for update/delete commands when using filters

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

@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <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 System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using NHibernate.Linq;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.GH2710
+{
+	using System.Threading;
+	[TestFixture]
+	public class FixtureAsync : BugTestCase
+	{
+		protected override void OnSetUp()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				var e = new Entity {MbrId = 1, MrcDailyMoved = "N"};
+				session.Save(e);
+
+				transaction.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.CreateQuery("delete from Entity").ExecuteUpdate();
+				session.CreateQuery("delete from System.Object").ExecuteUpdate();
+
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public async Task TestAsync()
+		{
+			var ids = Enumerable.Range(1, 10).ToList();
+			await (Task.WhenAll(Enumerable.Range(1, 50 - 1).Select(i =>
+			{
+				return UpdateEntityAsync(ids);
+			})));
+		}
+
+		private async Task UpdateEntityAsync(List<int> ids, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			using (var session = OpenSession())
+			using (var t = session.BeginTransaction())
+			{
+				session.EnableFilter("Filter").SetParameter("MbrId", 5);
+				await (session.Query<Entity>()
+				       .Where(o => ids.Contains(o.Id))
+				       .UpdateAsync(o => new Entity { MrcDailyMoved = "Y" }, cancellationToken));
+
+				await (t.CommitAsync(cancellationToken));
+			}
+		}
+	}
+}

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

@@ -0,0 +1,11 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.GH2710
+{
+	public class Entity
+	{
+		public virtual int Id { get; set; }
+		public virtual int MbrId { get; set; }
+		public virtual string MrcDailyMoved { get; set; } = "N";
+	}
+}

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

@@ -0,0 +1,60 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using NHibernate.Linq;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.GH2710
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		protected override void OnSetUp()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				var e = new Entity {MbrId = 1, MrcDailyMoved = "N"};
+				session.Save(e);
+
+				transaction.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.CreateQuery("delete from Entity").ExecuteUpdate();
+				session.CreateQuery("delete from System.Object").ExecuteUpdate();
+
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public void Test()
+		{
+			var ids = Enumerable.Range(1, 10).ToList();
+			Parallel.For(1, 50, i =>
+			{
+				UpdateEntity(ids);
+			});
+		}
+
+		private void UpdateEntity(List<int> ids)
+		{
+			using (var session = OpenSession())
+			using (var t = session.BeginTransaction())
+			{
+				session.EnableFilter("Filter").SetParameter("MbrId", 5);
+				session.Query<Entity>()
+				       .Where(o => ids.Contains(o.Id))
+				       .Update(o => new Entity { MrcDailyMoved = "Y" });
+
+				t.Commit();
+			}
+		}
+	}
+}

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.GH2710">
+
+  <class name="Entity">
+    <id name="Id" generator="native"/>
+    <property name="MbrId" column="mbrid"/>
+    <property name="MrcDailyMoved"/>
+    <filter name="Filter" condition="mbrid = :MbrId"/>
+  </class>
+
+  <filter-def name="Filter">
+    <filter-param name="MbrId" type="int"/>
+  </filter-def>
+
+</hibernate-mapping>

src/NHibernate/Async/Hql/Ast/ANTLR/Exec/BasicExecutor.cs

@@ -45,13 +45,14 @@ public override async Task<int> ExecuteAsync(QueryParameters parameters, ISessio
 				try
 				{
 					CheckParametersExpectedType(parameters); // NH Different behavior (NH-1898)
-
-					var sqlString = FilterHelper.ExpandDynamicFilterParameters(sql, Parameters, session);
+					// Create a copy of Parameters as ExpandDynamicFilterParameters may modify it
+					var parameterSpecifications = Parameters.ToList();
+					var sqlString = FilterHelper.ExpandDynamicFilterParameters(sql, parameterSpecifications, session);
 					var sqlQueryParametersList = sqlString.GetParameters().ToList();
-					SqlType[] parameterTypes = Parameters.GetQueryParameterTypes(sqlQueryParametersList, session.Factory);
+					SqlType[] parameterTypes = parameterSpecifications.GetQueryParameterTypes(sqlQueryParametersList, session.Factory);
 
 					st = await (session.Batcher.PrepareCommandAsync(CommandType.Text, sqlString, parameterTypes, cancellationToken)).ConfigureAwait(false);
-					foreach (var parameterSpecification in Parameters)
+					foreach (var parameterSpecification in parameterSpecifications)
 					{
 						await (parameterSpecification.BindAsync(st, sqlQueryParametersList, parameters, session, cancellationToken)).ConfigureAwait(false);
 					}

src/NHibernate/Async/Hql/Ast/ANTLR/Exec/MultiTableDeleteExecutor.cs

@@ -44,7 +44,8 @@ public override async Task<int> ExecuteAsync(QueryParameters parameters, ISessio
 				{
 					try
 					{
-						var paramsSpec = Walker.Parameters;
+						// Create a copy of Parameters as ExpandDynamicFilterParameters may modify it
+						var paramsSpec = Walker.Parameters.ToList();
 						var sqlString = FilterHelper.ExpandDynamicFilterParameters(idInsertSelect, paramsSpec, session);
 						var sqlQueryParametersList = sqlString.GetParameters().ToList();
 						SqlType[] parameterTypes = paramsSpec.GetQueryParameterTypes(sqlQueryParametersList, session.Factory);

src/NHibernate/Hql/Ast/ANTLR/Exec/BasicExecutor.cs

@@ -61,13 +61,14 @@ public override int Execute(QueryParameters parameters, ISessionImplementor sess
 				try
 				{
 					CheckParametersExpectedType(parameters); // NH Different behavior (NH-1898)
-
-					var sqlString = FilterHelper.ExpandDynamicFilterParameters(sql, Parameters, session);
+					// Create a copy of Parameters as ExpandDynamicFilterParameters may modify it
+					var parameterSpecifications = Parameters.ToList();
+					var sqlString = FilterHelper.ExpandDynamicFilterParameters(sql, parameterSpecifications, session);
 					var sqlQueryParametersList = sqlString.GetParameters().ToList();
-					SqlType[] parameterTypes = Parameters.GetQueryParameterTypes(sqlQueryParametersList, session.Factory);
+					SqlType[] parameterTypes = parameterSpecifications.GetQueryParameterTypes(sqlQueryParametersList, session.Factory);
 
 					st = session.Batcher.PrepareCommand(CommandType.Text, sqlString, parameterTypes);
-					foreach (var parameterSpecification in Parameters)
+					foreach (var parameterSpecification in parameterSpecifications)
 					{
 						parameterSpecification.Bind(st, sqlQueryParametersList, parameters, session);
 					}

src/NHibernate/Hql/Ast/ANTLR/Exec/MultiTableDeleteExecutor.cs

@@ -81,7 +81,8 @@ public override int Execute(QueryParameters parameters, ISessionImplementor sess
 				{
 					try
 					{
-						var paramsSpec = Walker.Parameters;
+						// Create a copy of Parameters as ExpandDynamicFilterParameters may modify it
+						var paramsSpec = Walker.Parameters.ToList();
 						var sqlString = FilterHelper.ExpandDynamicFilterParameters(idInsertSelect, paramsSpec, session);
 						var sqlQueryParametersList = sqlString.GetParameters().ToList();
 						SqlType[] parameterTypes = paramsSpec.GetQueryParameterTypes(sqlQueryParametersList, session.Factory);