Merge branch '3.3.x' into master

Author: hazzik

src/NHibernate.Test/Linq/LoggingTests.cs

@@ -1,5 +1,6 @@
 using System.Linq;
 using NHibernate.Cfg;
+using NHibernate.DomainModel.Northwind.Entities;
 using NUnit.Framework;
 
 namespace NHibernate.Test.Linq
@@ -26,5 +27,35 @@ public void PageBetweenProjections()
 			}
 		}
 
+
+		[Test]
+		public void CanLogLinqExpressionWithoutInitializingContainedProxy()
+		{
+			var productId = db.Products.Select(p => p.ProductId).First();
+
+			using (var logspy = new LogSpy("NHibernate.Linq"))
+			{
+				var productProxy = session.Load<Product>(productId);
+				Assert.That(NHibernateUtil.IsInitialized(productProxy), Is.False);
+
+				var result = from product in db.Products
+				             where product == productProxy
+				             select product;
+
+				Assert.That(result.Count(), Is.EqualTo(1));
+
+				// Verify that the expected logging did happen.
+				var actualLog = logspy.GetWholeLog();
+
+				const string expectedLog =
+					"Expression (partially evaluated): value(NHibernate.Linq.NhQueryable`1[NHibernate.DomainModel.Northwind.Entities.Product])" + 
+					".Where(product => (product == Product#1)).Count()";
+				Assert.That(actualLog, Is.StringContaining(expectedLog));
+
+				// And verify that the proxy in the expression wasn't initialized.
+				Assert.That(NHibernateUtil.IsInitialized(productProxy), Is.False,
+				            "ERROR: We expected the proxy to NOT be initialized.");
+			}
+		}
 	}
 }

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

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

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

@@ -0,0 +1,65 @@
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH3428
+{
+	using NHibernate.Criterion;
+
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+
+		protected override bool AppliesTo(Dialect.Dialect dialect)
+		{
+			return dialect is Dialect.MsSql2005Dialect;
+		}
+
+		protected override void OnSetUp()
+		{
+			using (ISession session = OpenSession())
+			using (ITransaction transaction = session.BeginTransaction())
+			{
+				var e1 = new Entity { Name = "Bob" };
+				session.Save(e1);
+
+				var e2 = new Entity { Name = "Sally" };
+				session.Save(e2);
+
+				session.Flush();
+				transaction.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (ISession session = OpenSession())
+			using (ITransaction transaction = session.BeginTransaction())
+			{
+				session.Delete("from System.Object");
+
+				session.Flush();
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public void QueryFailsWhenDistinctOrderedResultIsPagedPastPageOne()
+		{
+			using (ISession session = this.OpenSession())
+			using (session.BeginTransaction())
+			{
+				var criteria = session.CreateCriteria<Entity>();
+				var projectionList = Projections.ProjectionList().Add(Projections.Property("Name"), "Name");
+
+				criteria.SetProjection(Projections.Distinct(projectionList));
+
+				criteria.SetFirstResult(1).SetMaxResults(1);
+				criteria.AddOrder(Order.Asc("Name"));
+
+				var result = criteria.List();
+
+				Assert.AreEqual(1, result.Count);
+				Assert.AreEqual("Sally", result[0]);
+			}
+		}
+	}
+}

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

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

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

@@ -0,0 +1,117 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Linq;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH3436
+{
+	public class Fixture : TestCaseMappingByCode
+	{
+		protected override HbmMapping GetMappings()
+		{
+			var mapper = new ModelMapper();
+			mapper.Class<TestEntity>(rc =>
+			{
+				rc.Table("TestEntity");
+				rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb));
+			});
+			return mapper.CompileMappingForAllExplicitlyAddedEntities();
+		}
+
+		protected override void OnSetUp()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				var e1 = new TestEntity();
+				session.Save(e1);
+
+				var e2 = new TestEntity();
+				session.Save(e2);
+
+				session.Flush();
+				transaction.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.Delete("from System.Object");
+
+				session.Flush();
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public void TestQueryWithContainsInParallel()
+		{
+			var ids = new List<Guid>
+			{
+				Guid.NewGuid(),
+				Guid.NewGuid(),
+			};
+			const int threadsToRun = 32;
+			var events = new WaitHandle[threadsToRun];
+			var exceptions = new List<Exception>();
+			for (var i = 0; i < threadsToRun; i++)
+			{
+				var @event = new ManualResetEvent(false);
+				events[i] = @event;
+				ThreadPool.QueueUserWorkItem(s =>
+				{
+					try
+					{
+						Run(ids);
+					}
+					catch (Exception ex)
+					{
+						exceptions.Add(ex);
+					}
+					finally
+					{
+						@event.Set();
+					}
+				});
+			}
+			WaitHandle.WaitAll(events);
+			Assert.IsEmpty(exceptions);
+		}
+		
+		[Test]
+		public void TestQueryWithContains()
+		{
+			var ids = new List<Guid>
+			{
+				Guid.NewGuid(),
+				Guid.NewGuid(),
+			};
+			Run(ids);
+		}
+
+		private void Run(ICollection<Guid> ids)
+		{
+			using (var session = sessions.OpenSession())
+			using (session.BeginTransaction())
+			{
+				var result = session.Query<TestEntity>()
+					.Where(entity => ids.Contains(entity.Id))
+					.ToList();
+
+				Assert.That(result.Count, Is.EqualTo(0));
+			}
+		}
+
+		public class TestEntity
+		{
+			public virtual Guid Id { get; set; }
+		}
+	}
+}

src/NHibernate.Test/NHibernate.Test.csproj

@@ -678,6 +678,8 @@
     <Compile Include="NHSpecificTest\NH3058\SampleTest.cs" />
     <Compile Include="NHSpecificTest\NH1818\DomainClass.cs" />
     <Compile Include="NHSpecificTest\NH1818\Fixture1818.cs" />
+    <Compile Include="NHSpecificTest\NH3428\Entity.cs" />
+    <Compile Include="NHSpecificTest\NH3428\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3408\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3408\Model.cs" />
     <Compile Include="NHSpecificTest\NH2297\CustomCompositeUserType.cs" />
@@ -1079,6 +1081,7 @@
     <Compile Include="NHSpecificTest\NH3153\Fixture.cs" />
     <Compile Include="MappingByCode\IntegrationTests\NH3105\Model.cs" />
     <Compile Include="MappingByCode\IntegrationTests\NH3105\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH3436\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH941\Domain.cs" />
     <Compile Include="NHSpecificTest\NH941\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH941\FixtureUsingList.cs" />
@@ -2957,6 +2960,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH3058\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2985\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH1818\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH3428\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3408\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2408\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2297\MappingsNames.hbm.xml" />

src/NHibernate/Engine/Query/HQLQueryPlan.cs

@@ -4,6 +4,7 @@
 
 using NHibernate.Event;
 using NHibernate.Hql;
+using NHibernate.Linq;
 using NHibernate.Type;
 using NHibernate.Util;
 
@@ -42,6 +43,16 @@ protected HQLQueryPlan(string sourceQuery, IQueryTranslator[] translators)
             FinaliseQueryPlan();
         }
 
+		internal HQLQueryPlan(HQLQueryPlan source)
+		{
+			Translators = source.Translators;
+			_sourceQuery = source._sourceQuery;
+			QuerySpaces = source.QuerySpaces;
+			ParameterMetadata = source.ParameterMetadata;
+			ReturnMetadata = source.ReturnMetadata;
+			SqlStrings = source.SqlStrings;
+		}
+
 	    public ISet<string> QuerySpaces
 		{
 		    get;

src/NHibernate/Engine/Query/QueryExpressionPlan.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using NHibernate.Hql;
+using NHibernate.Linq;
 
 namespace NHibernate.Engine.Query
 {
@@ -20,9 +21,20 @@ protected QueryExpressionPlan(string key, IQueryTranslator[] translators)
 		{
 		}
 
+		private QueryExpressionPlan(HQLQueryPlan source, IQueryExpression expression) 
+			: base(source)
+		{
+			QueryExpression = expression;
+		}
+
 		protected static IQueryTranslator[] CreateTranslators(IQueryExpression queryExpression, string collectionRole, bool shallow, IDictionary<string, IFilter> enabledFilters, ISessionFactoryImplementor factory)
 		{
 			return factory.Settings.QueryTranslatorFactory.CreateQueryTranslators(queryExpression, collectionRole, shallow, enabledFilters, factory);
 		}
+
+		public QueryExpressionPlan Copy(IQueryExpression expression)
+		{
+			return new QueryExpressionPlan(this, expression);
+		}
 	}
 }

src/NHibernate/Engine/Query/QueryPlanCache.cs

@@ -56,7 +56,7 @@ public IQueryPlan GetHQLQueryPlan(string queryString, bool shallow, IDictionary<
 		public IQueryExpressionPlan GetHQLQueryPlan(IQueryExpression queryExpression, bool shallow, IDictionary<string, IFilter> enabledFilters)
 		{
 			var key = new HQLQueryPlanKey(queryExpression, shallow, enabledFilters);
-			var plan = (IQueryExpressionPlan)planCache[key];
+			var plan = (QueryExpressionPlan)planCache[key];
 
 			if (plan == null)
 			{
@@ -83,8 +83,12 @@ public IQueryExpressionPlan GetHQLQueryPlan(IQueryExpression queryExpression, bo
 					// for cases when we have list parameters in query, like @p1.Contains(...),
 					// it does, and then it uses parameters from first try. 
 					//TODO: cache only required parts of QueryExpression
-					planExpression._expression = expression._expression;
-					planExpression._constantToParameterMap = expression._constantToParameterMap;
+
+					//NH-3436
+					// We have to return new instance plan with it's own query expression
+					// because other treads can override queryexpression of current plan during execution of query if we will use cached instance of plan 
+					expression.CopyExpressionTranslation(planExpression);
+					plan = plan.Copy(expression);
 				}
 			}