Consolidated adding of queryspaces to be invalidated

Author: gliljas

src/AsyncGenerator.yml

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

src/NHibernate/Async/Engine/ActionQueue.cs

@@ -46,7 +46,9 @@ private async Task AfterExecutionsAsync(CancellationToken cancellationToken)
 			cancellationToken.ThrowIfCancellationRequested();
 			if (session.Factory.Settings.IsQueryCacheEnabled)
 			{
-				await (session.Factory.UpdateTimestampsCache.PreInvalidateAsync(executedSpaces.ToArray(), cancellationToken)).ConfigureAwait(false);
+				var spaces = executedSpaces.ToArray();
+				afterTransactionProcesses.AddSpacesToInvalidate(spaces);
+				await (session.Factory.UpdateTimestampsCache.PreInvalidateAsync(spaces, cancellationToken)).ConfigureAwait(false);
 			}
 			executedSpaces.Clear();
 		}
@@ -90,11 +92,11 @@ public async Task ExecuteInsertsAsync(CancellationToken cancellationToken)
 			cancellationToken.ThrowIfCancellationRequested();
 			try
 			{
-				await ExecuteActionsAsync(insertions, cancellationToken);
+				await (ExecuteActionsAsync(insertions, cancellationToken)).ConfigureAwait(false);
 			}
 			finally
 			{
-				await AfterExecutionsAsync(cancellationToken);
+				await (AfterExecutionsAsync(cancellationToken)).ConfigureAwait(false);
 			}
 		}
 

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

@@ -43,7 +43,7 @@ protected virtual async Task CoordinateSharedCacheCleanupAsync(ISessionImplement
 
 			if (session.IsEventSource)
 			{
-				((IEventSource) session).ActionQueue.AddAction(action);
+				((IEventSource)session).ActionQueue.AddAction(action);
 			}
 		}
 
@@ -207,4 +207,4 @@ public async Task DoWorkAsync(DbConnection connection, DbTransaction transaction
 			}
 		}
 	}
-}
+}

src/NHibernate/Engine/ActionQueue.cs

@@ -150,7 +150,9 @@ private void AfterExecutions()
 		{
 			if (session.Factory.Settings.IsQueryCacheEnabled)
 			{
-				session.Factory.UpdateTimestampsCache.PreInvalidate(executedSpaces.ToArray());
+				var spaces = executedSpaces.ToArray();
+				afterTransactionProcesses.AddSpacesToInvalidate(spaces);
+				session.Factory.UpdateTimestampsCache.PreInvalidate(spaces);
 			}
 			executedSpaces.Clear();
 		}
@@ -169,28 +171,23 @@ public void Execute(IExecutable executable)
 
 		private void InnerExecute(IExecutable executable)
 		{
-			if (executable.PropertySpaces != null)
-			{
-				executedSpaces.UnionWith(executable.PropertySpaces);
-			}
 			try
 			{
 				executable.Execute();
 			}
 			finally
 			{
+				if (executable.PropertySpaces != null)
+				{
+					executedSpaces.UnionWith(executable.PropertySpaces);
+				}
 				RegisterCleanupActions(executable);
 			}
 		}
 
 		private void RegisterCleanupActions(IExecutable executable)
 		{
 			beforeTransactionProcesses.Register(executable.BeforeTransactionCompletionProcess);
-			if (session.Factory.Settings.IsQueryCacheEnabled)
-			{
-				string[] spaces = executable.PropertySpaces;
-				afterTransactionProcesses.AddSpacesToInvalidate(spaces);
-			}
 			afterTransactionProcesses.Register(executable.AfterTransactionCompletionProcess);
 		}