NH-3811 Make table counter per thread (merge).

Author: oskarb

src/NHibernate.Test/CrossThreadTestRunner.cs

@@ -0,0 +1,70 @@
+using System;
+using System.Reflection;
+using System.Security.Permissions;
+using System.Threading;
+
+namespace NHibernate.Test
+{
+	/// <summary>
+	/// Helper class to execute a method on another thread, catching all exceptions then rethrowing them
+	/// on another thread that calls Join().
+	/// </summary>
+	/// TODO: Explore if this can be merged with MultiThreadRunner (probably should add exception handling to the latter).
+	class CrossThreadTestRunner
+	{
+		private Exception _lastException;
+		private readonly Thread _thread;
+		private readonly ThreadStart _start;
+
+		private const string remoteStackTraceFieldName = "_remoteStackTraceString";
+
+		private static readonly FieldInfo RemoteStackTraceField = typeof(Exception).GetField(remoteStackTraceFieldName,
+		                                                                                     BindingFlags.Instance |
+		                                                                                     BindingFlags.NonPublic);
+
+		public CrossThreadTestRunner(ThreadStart start)
+		{
+			_start = start;
+			_thread = new Thread(Run);
+			_thread.SetApartmentState(ApartmentState.STA);
+		}
+
+		public void Start()
+		{
+			_lastException = null;
+			_thread.Start();
+		}
+
+		public void Join()
+		{
+			_thread.Join();
+
+			if (_lastException != null)
+			{
+				ThrowExceptionPreservingStack(_lastException);
+			}
+		}
+
+		private void Run()
+		{
+			try
+			{
+				_start.Invoke();
+			}
+			catch (Exception e)
+			{
+				_lastException = e;
+			}
+		}
+
+		[ReflectionPermission(SecurityAction.Demand)]
+		private static void ThrowExceptionPreservingStack(Exception exception)
+		{
+			if (RemoteStackTraceField != null)
+			{
+				RemoteStackTraceField.SetValue(exception, exception.StackTrace + Environment.NewLine);
+			}
+			throw exception;
+		}
+	}
+}

src/NHibernate.Test/MappingTest/TableFixture.cs

@@ -1,3 +1,5 @@
+using System.Linq;
+using System.Threading;
 using NHibernate.Dialect;
 using NHibernate.Mapping;
 using NUnit.Framework;
@@ -59,5 +61,45 @@ public void SchemaNameQuoted()
 
 			Assert.AreEqual("[schema].name", tbl.GetQualifiedName(dialect));
 		}
+
+		[Test]
+		public void TablesUniquelyNamed()
+		{
+			Table tbl1 = new Table();
+			Table tbl2 = new Table();
+
+			Assert.AreEqual(tbl1.UniqueInteger + 1, tbl2.UniqueInteger);
+		}
+
+		[Test]
+		public void TablesUniquelyNamedOnlyWithinThread()
+		{
+			var uniqueIntegerList = new System.Collections.Concurrent.ConcurrentBag<int>();
+			var method = new ThreadStart(() =>
+			                             {
+				                             Table tbl1 = new Table();
+				                             Table tbl2 = new Table();
+
+				                             // Store these values for later comparison
+				                             uniqueIntegerList.Add(tbl1.UniqueInteger);
+				                             uniqueIntegerList.Add(tbl2.UniqueInteger);
+
+				                             // Ensure that within a thread we have unique integers
+				                             Assert.AreEqual(tbl1.UniqueInteger + 1, tbl2.UniqueInteger);
+			                             });
+
+			var thread1 = new CrossThreadTestRunner(method);
+			var thread2 = new CrossThreadTestRunner(method);
+
+			thread1.Start();
+			thread2.Start();
+
+			thread1.Join();
+			thread2.Join();
+
+			// There should in total be 4 tables, but only two distinct identifiers.
+			Assert.AreEqual(4, uniqueIntegerList.Count);
+			Assert.AreEqual(2, uniqueIntegerList.Distinct().Count());
+		}
 	}
 }

src/NHibernate.Test/NHibernate.Test.csproj

@@ -231,6 +231,7 @@
     <Compile Include="Criteria\MaterialResource.cs" />
     <Compile Include="Criteria\ProjectionsTest.cs" />
     <Compile Include="Criteria\Reptile.cs" />
+    <Compile Include="CrossThreadTestRunner.cs" />
     <Compile Include="DialectTest\FunctionTests\SubstringSupportFixture.cs" />
     <Compile Include="DialectTest\FunctionTests\SequenceSupportFixture.cs" />
     <Compile Include="DialectTest\Ingres9DialectFixture.cs" />

src/NHibernate/Mapping/Table.cs

@@ -25,7 +25,9 @@ public enum SchemaAction
 	[Serializable]
 	public class Table : IRelationalModel
 	{
+		[ThreadStatic]
 		private static int tableCounter;
+
 		private readonly List<string> checkConstraints = new List<string>();
 		private readonly LinkedHashMap<string, Column> columns = new LinkedHashMap<string, Column>();
 		private readonly Dictionary<ForeignKeyKey, ForeignKey> foreignKeys = new Dictionary<ForeignKeyKey, ForeignKey>();