GH1730 Query Cache effective only after closing the session that created the cache

Author: igitur

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,111 @@
+using NHibernate.Cfg;
+using NUnit.Framework;
+using System.Threading.Tasks;
+
+namespace NHibernate.Test.NHSpecificTest.GH1730
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		protected override void Configure(Configuration configuration)
+		{
+			configuration.SetProperty("show_sql", "true");
+			configuration.SetProperty("generate_statistics", "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);
+			}
+		}
+
+		[Test]
+		public async Task HitCacheInSameSessionAsync()
+		{
+			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);
+						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/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/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/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);