Reduce the number of calls to UpdateTimestampsCache

src/AsyncGenerator.yml

@@ -119,6 +119,8 @@
     - name: GetFieldValue
     - name: IsDBNull
     - name: WriteLine
+    - name: AddAction
+      containingTypeName: ActionQueue
     callForwarding: true
     cancellationTokens:
       guards: true

src/NHibernate.Test/Async/SecondLevelCacheTest/InvalidationTests.cs

@@ -0,0 +1,112 @@
+//------------------------------------------------------------------------------
+// <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;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using NHibernate.Cache;
+using NHibernate.Cfg;
+using NHibernate.Impl;
+using NHibernate.Test.SecondLevelCacheTests;
+using NSubstitute;
+using NUnit.Framework;
+using Environment = System.Environment;
+
+namespace NHibernate.Test.SecondLevelCacheTest
+{
+	using System.Threading;
+	[TestFixture]
+	public class InvalidationTestsAsync : TestCase
+	{
+		protected override string MappingsAssembly => "NHibernate.Test";
+
+		protected override IList Mappings => new[] { "SecondLevelCacheTest.Item.hbm.xml" };
+
+		protected override void Configure(Configuration configuration)
+		{
+			base.Configure(configuration);
+			configuration.Properties[Cfg.Environment.CacheProvider] = typeof(HashtableCacheProvider).AssemblyQualifiedName;
+			configuration.Properties[Cfg.Environment.UseQueryCache] = "true";
+		}
+
+		[Test]
+		public async Task InvalidatesEntitiesAsync()
+		{
+			var cache = Substitute.For<UpdateTimestampsCache>(Sfi.Settings, new Dictionary<string, string>());
+			((SessionFactoryImpl) (Sfi as DebugSessionFactory).ActualFactory).SetPropertyUsingReflection(x => x.UpdateTimestampsCache, cache);
+
+			var items = new List<Item>();
+			using (ISession session = OpenSession())
+			{
+				using (ITransaction tx = session.BeginTransaction())
+				{
+					foreach (var i in Enumerable.Range(1, 10))
+					{
+						var item = new Item { Id = i };
+						await (session.SaveAsync(item));
+					}
+					await (tx.CommitAsync());
+				}
+
+				using (ITransaction tx = session.BeginTransaction())
+				{
+					foreach (var i in Enumerable.Range(1, 10))
+					{
+						var item = await (session.GetAsync<Item>(i));
+						item.Name = item.Id.ToString();
+					}
+					await (tx.CommitAsync());
+				}
+
+				using (ITransaction tx = session.BeginTransaction())
+				{
+					foreach (var i in Enumerable.Range(1, 10))
+					{
+						var item = await (session.GetAsync<Item>(i));
+						await (session.DeleteAsync(item));
+					}
+					await (tx.CommitAsync());
+				}
+			}
+			//Should receive one preinvalidation and one invalidation per commit
+			await (cache.Received(3).PreInvalidateAsync(Arg.Is<object[]>(x => x.Length==1 && (string)x[0] == "Item"), CancellationToken.None));
+			await (cache.Received(3).InvalidateAsync(Arg.Is<object[]>(x => x.Length == 1 && (string) x[0] == "Item"), CancellationToken.None));
+
+		}
+
+		public async Task CleanUpAsync(CancellationToken cancellationToken = default(CancellationToken))
+		{
+			using (ISession s = OpenSession())
+			using (ITransaction tx = s.BeginTransaction())
+			{
+				await (s.DeleteAsync("from Item", cancellationToken));
+				await (tx.CommitAsync(cancellationToken));
+			}
+		}
+
+		public void CleanUp()
+		{
+			using (ISession s = OpenSession())
+			using (ITransaction tx = s.BeginTransaction())
+			{
+				s.Delete("from Item");
+				tx.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			CleanUp();
+			base.OnTearDown();
+		}
+	}
+}

src/NHibernate.Test/SecondLevelCacheTest/InvalidationTests.cs

@@ -0,0 +1,91 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using NHibernate.Cache;
+using NHibernate.Cfg;
+using NHibernate.Impl;
+using NHibernate.Test.SecondLevelCacheTests;
+using NSubstitute;
+using NUnit.Framework;
+using Environment = System.Environment;
+
+namespace NHibernate.Test.SecondLevelCacheTest
+{
+	[TestFixture]
+	public class InvalidationTests : TestCase
+	{
+		protected override string MappingsAssembly => "NHibernate.Test";
+
+		protected override IList Mappings => new[] { "SecondLevelCacheTest.Item.hbm.xml" };
+
+		protected override void Configure(Configuration configuration)
+		{
+			base.Configure(configuration);
+			configuration.Properties[Cfg.Environment.CacheProvider] = typeof(HashtableCacheProvider).AssemblyQualifiedName;
+			configuration.Properties[Cfg.Environment.UseQueryCache] = "true";
+		}
+
+		[Test]
+		public void InvalidatesEntities()
+		{
+			var cache = Substitute.For<UpdateTimestampsCache>(Sfi.Settings, new Dictionary<string, string>());
+			((SessionFactoryImpl) (Sfi as DebugSessionFactory).ActualFactory).SetPropertyUsingReflection(x => x.UpdateTimestampsCache, cache);
+
+			var items = new List<Item>();
+			using (ISession session = OpenSession())
+			{
+				using (ITransaction tx = session.BeginTransaction())
+				{
+					foreach (var i in Enumerable.Range(1, 10))
+					{
+						var item = new Item { Id = i };
+						session.Save(item);
+					}
+					tx.Commit();
+				}
+
+				using (ITransaction tx = session.BeginTransaction())
+				{
+					foreach (var i in Enumerable.Range(1, 10))
+					{
+						var item = session.Get<Item>(i);
+						item.Name = item.Id.ToString();
+					}
+					tx.Commit();
+				}
+
+				using (ITransaction tx = session.BeginTransaction())
+				{
+					foreach (var i in Enumerable.Range(1, 10))
+					{
+						var item = session.Get<Item>(i);
+						session.Delete(item);
+					}
+					tx.Commit();
+				}
+			}
+			//Should receive one preinvalidation and one invalidation per commit
+			cache.Received(3).PreInvalidate(Arg.Is<object[]>(x => x.Length==1 && (string)x[0] == "Item"));
+			cache.Received(3).Invalidate(Arg.Is<object[]>(x => x.Length == 1 && (string) x[0] == "Item"));
+
+		}
+
+		public void CleanUp()
+		{
+			using (ISession s = OpenSession())
+			using (ITransaction tx = s.BeginTransaction())
+			{
+				s.Delete("from Item");
+				tx.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			CleanUp();
+			base.OnTearDown();
+		}
+	}
+}

src/NHibernate.Test/TestExtensions.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Linq.Expressions;
+using System.Reflection;
+
+namespace NHibernate.Test
+{
+	//Utility extension methods for use in unit tests. 
+	public static class TestExtensions
+	{
+		public static T SetPropertyUsingReflection<T, TProp>(this T instance, Expression<Func<T, TProp>> property, TProp value)
+		{
+			var method = property.Body as MemberExpression;
+			var propertyInfo = typeof(T).GetProperty(method.Member.Name);
+			if (propertyInfo!= null && propertyInfo.CanWrite)
+			{
+				propertyInfo.SetValue(instance, value);
+			}
+			else
+			{
+				//camel cased field
+				var name = method.Member.Name.Substring(0, 1).ToLowerInvariant() + method.Member.Name.Substring(1);
+				var field = typeof(T).GetField(name, BindingFlags.NonPublic | BindingFlags.Instance);
+				if (field != null)
+				{
+					field.SetValue(instance, value);
+				}
+			}
+			return instance;
+		}
+
+	}
+}

src/NHibernate/Async/Cache/UpdateTimestampsCache.cs

@@ -34,7 +34,7 @@ public Task ClearAsync(CancellationToken cancellationToken)
 		}
 
 		[MethodImpl()]
-		public async Task PreInvalidateAsync(object[] spaces, CancellationToken cancellationToken)
+		public virtual async Task PreInvalidateAsync(object[] spaces, CancellationToken cancellationToken)
 		{
 			cancellationToken.ThrowIfCancellationRequested();
 			using (await _preInvalidate.LockAsync())
@@ -52,7 +52,7 @@ public async Task PreInvalidateAsync(object[] spaces, CancellationToken cancella
 
 		/// <summary></summary>
 		[MethodImpl()]
-		public async Task InvalidateAsync(object[] spaces, CancellationToken cancellationToken)
+		public virtual async Task InvalidateAsync(object[] spaces, CancellationToken cancellationToken)
 		{
 			cancellationToken.ThrowIfCancellationRequested();
 			using (await _invalidate.LockAsync())
@@ -69,7 +69,7 @@ public async Task InvalidateAsync(object[] spaces, CancellationToken cancellatio
 		}
 
 		[MethodImpl()]
-		public async Task<bool> IsUpToDateAsync(ISet<string> spaces, long timestamp /* H2.1 has Long here */, CancellationToken cancellationToken)
+		public virtual async Task<bool> IsUpToDateAsync(ISet<string> spaces, long timestamp /* H2.1 has Long here */, CancellationToken cancellationToken)
 		{
 			cancellationToken.ThrowIfCancellationRequested();
 			using (await _isUpToDate.LockAsync())
@@ -108,4 +108,4 @@ public async Task<bool> IsUpToDateAsync(ISet<string> spaces, long timestamp /* H
 			}
 		}
 	}
-}
+}