Do not try to invalidate query spaces for non cached entities

Fixes #2129

Author: hazzik

src/NHibernate/Action/BulkOperationCleanupAction.cs

@@ -14,12 +14,16 @@ namespace NHibernate.Action
 	/// Implementation of BulkOperationCleanupAction.
 	/// </summary>
 	[Serializable]
-	public partial class BulkOperationCleanupAction : IAsyncExecutable, IAfterTransactionCompletionProcess
+	public partial class BulkOperationCleanupAction :
+		IAsyncExecutable,
+		IAfterTransactionCompletionProcess,
+		ICacheableExecutable
 	{
 		private readonly ISessionImplementor session;
 		private readonly HashSet<string> affectedEntityNames = new HashSet<string>();
 		private readonly HashSet<string> affectedCollectionRoles = new HashSet<string>();
 		private readonly List<string> spaces;
+		private readonly bool _hasCache;
 
 		public BulkOperationCleanupAction(ISessionImplementor session, IQueryable[] affectedQueryables)
 		{
@@ -29,6 +33,7 @@ public BulkOperationCleanupAction(ISessionImplementor session, IQueryable[] affe
 			{
 				if (affectedQueryables[i].HasCache)
 				{
+					_hasCache = true;
 					affectedEntityNames.Add(affectedQueryables[i].EntityName);
 				}
 				ISet<string> roles = session.Factory.GetCollectionRolesByEntityParticipant(affectedQueryables[i].EntityName);
@@ -65,6 +70,7 @@ public BulkOperationCleanupAction(ISessionImplementor session, ISet<string> quer
 				{
 					if (persister.HasCache)
 					{
+						_hasCache = true;
 						affectedEntityNames.Add(persister.EntityName);
 					}
 					ISet<string> roles = session.Factory.GetCollectionRolesByEntityParticipant(persister.EntityName);
@@ -91,6 +97,8 @@ private bool AffectedEntity(ISet<string> querySpaces, string[] entitySpaces)
 			return entitySpaces.Any(querySpaces.Contains);
 		}
 
+		public bool HasCache => _hasCache;
+
 		#region IExecutable Members
 
 		public string[] PropertySpaces

src/NHibernate/Action/CollectionAction.cs

@@ -14,7 +14,12 @@ namespace NHibernate.Action
 	/// Any action relating to insert/update/delete of a collection
 	/// </summary>
 	[Serializable]
-	public abstract partial class CollectionAction : IAsyncExecutable, IComparable<CollectionAction>, IDeserializationCallback, IAfterTransactionCompletionProcess
+	public abstract partial class CollectionAction: 
+		IAsyncExecutable, 
+		IComparable<CollectionAction>,
+		IDeserializationCallback,
+		IAfterTransactionCompletionProcess,
+		ICacheableExecutable
 	{
 		private readonly object key;
 		[NonSerialized] private ICollectionPersister persister;
@@ -77,6 +82,8 @@ protected internal ISessionImplementor Session
 			get { return session; }
 		}
 
+		public bool HasCache => persister.HasCache;
+
 		#region IExecutable Members
 
 		/// <summary>

src/NHibernate/Action/EntityAction.cs

@@ -18,7 +18,8 @@ public abstract partial class EntityAction :
 		IBeforeTransactionCompletionProcess,
 		IAfterTransactionCompletionProcess,
 		IComparable<EntityAction>, 
-		IDeserializationCallback
+		IDeserializationCallback,
+		ICacheableExecutable
 	{
 		private readonly string entityName;
 		private readonly object id;
@@ -195,5 +196,7 @@ public void ExecuteAfterTransactionCompletion(bool success)
 		{
 			AfterTransactionCompletionProcessImpl(success);
 		}
+
+		public bool HasCache => persister.HasCache;
 	}
 }

src/NHibernate/Action/ICacheableExecutable.cs

@@ -0,0 +1,8 @@
+namespace NHibernate.Action
+{
+	//6.0 TODO: Merge to IExecutable
+	public interface ICacheableExecutable : IExecutable
+	{
+		bool HasCache { get; }
+	}
+}

src/NHibernate/Async/Action/BulkOperationCleanupAction.cs

@@ -20,7 +20,10 @@
 
 namespace NHibernate.Action
 {
-	public partial class BulkOperationCleanupAction : IAsyncExecutable, IAfterTransactionCompletionProcess
+	public partial class BulkOperationCleanupAction :
+		IAsyncExecutable,
+		IAfterTransactionCompletionProcess,
+		ICacheableExecutable
 	{
 
 		#region IExecutable Members

src/NHibernate/Async/Action/CollectionAction.cs

@@ -22,7 +22,12 @@ namespace NHibernate.Action
 {
 	using System.Threading.Tasks;
 	using System.Threading;
-	public abstract partial class CollectionAction : IAsyncExecutable, IComparable<CollectionAction>, IDeserializationCallback, IAfterTransactionCompletionProcess
+	public abstract partial class CollectionAction: 
+		IAsyncExecutable, 
+		IComparable<CollectionAction>,
+		IDeserializationCallback,
+		IAfterTransactionCompletionProcess,
+		ICacheableExecutable
 	{
 
 		protected async Task<object> GetKeyAsync(CancellationToken cancellationToken)

src/NHibernate/Async/Action/EntityAction.cs

@@ -25,7 +25,8 @@ public abstract partial class EntityAction :
 		IBeforeTransactionCompletionProcess,
 		IAfterTransactionCompletionProcess,
 		IComparable<EntityAction>, 
-		IDeserializationCallback
+		IDeserializationCallback,
+		ICacheableExecutable
 	{
 
 		#region IExecutable Members

src/NHibernate/Engine/ActionQueue.cs

@@ -216,7 +216,8 @@ private void RegisterCleanupActions(IExecutable executable)
 				RegisterProcess(executable.AfterTransactionCompletionProcess);
 #pragma warning restore 618,619
 			}
-			if (executable.PropertySpaces != null)
+
+			if (executable.PropertySpaces != null && (!(executable is ICacheableExecutable ce) || ce.HasCache))
 			{
 				executedSpaces.UnionWith(executable.PropertySpaces);
 			}