WIP Move cache check from IEntityPersister.IsTransient to ForeignKeys.IsTransientSlow

Author: bahusoid

src/NHibernate.DomainModel/Async/CustomPersister.cs

@@ -34,44 +34,6 @@ public partial class CustomPersister : IEntityPersister
 
 		#region IOptimisticCacheSource Members
 
-		public Task<int[]> FindDirtyAsync(object[] currentState, object[] previousState, object entity, ISessionImplementor session, CancellationToken cancellationToken)
-		{
-			try
-			{
-				if (!Equals(currentState[0], previousState[0]))
-				{
-					return Task.FromResult<int[]>(new int[] { 0 });
-				}
-				else
-				{
-					return Task.FromResult<int[]>(null);
-				}
-			}
-			catch (Exception ex)
-			{
-				return Task.FromException<int[]>(ex);
-			}
-		}
-
-		public Task<int[]> FindModifiedAsync(object[] old, object[] current, object entity, ISessionImplementor session, CancellationToken cancellationToken)
-		{
-			try
-			{
-				if (!Equals(old[0], current[0]))
-				{
-					return Task.FromResult<int[]>(new int[] { 0 });
-				}
-				else
-				{
-					return Task.FromResult<int[]>(null);
-				}
-			}
-			catch (Exception ex)
-			{
-				return Task.FromException<int[]>(ex);
-			}
-		}
-
 		public Task<object[]> GetNaturalIdentifierSnapshotAsync(object id, ISessionImplementor session, CancellationToken cancellationToken)
 		{
 			return Task.FromResult<object[]>(null);
@@ -165,18 +127,6 @@ public Task<object> ForceVersionIncrementAsync(object id, object currentVersion,
 			return Task.FromResult<object>(null);
 		}
 
-		public Task<bool?> IsTransientAsync(object obj, ISessionImplementor session, CancellationToken cancellationToken)
-		{
-			try
-			{
-				return Task.FromResult<bool?>(((Custom) obj).Id == null);
-			}
-			catch (Exception ex)
-			{
-				return Task.FromException<bool?>(ex);
-			}
-		}
-
 		public Task ProcessInsertGeneratedPropertiesAsync(object id, object entity, object[] state, ISessionImplementor session, CancellationToken cancellationToken)
 		{
 			return Task.CompletedTask;

src/NHibernate.Test/Async/NHSpecificTest/GH1486/Fixture.cs

@@ -16,7 +16,6 @@
 namespace NHibernate.Test.NHSpecificTest.GH1486
 {
 	using System.Threading.Tasks;
-	using System.Threading;
 	[TestFixture]
 	public class FixtureAsync : BugTestCase
 	{
@@ -142,12 +141,12 @@ public async Task TestDirectCallToIsModifiedAsync()
 
 					var checkable = new [] { true, true, true };
 					Assert.That(
-						() => componentType.IsModifiedAsync(new object[] { "", "", "" }, person.Address, checkable, sessionImplementor, CancellationToken.None),
+						() => componentType.IsModified(new object[] { "", "", "" }, person.Address, checkable, sessionImplementor),
 						Throws.Nothing,
 						"Checking component against an array snapshot failed");
-					var isModified = await (componentType.IsModifiedAsync(person.Address, person.Address, checkable, sessionImplementor, CancellationToken.None));
+					var isModified = componentType.IsModified(person.Address, person.Address, checkable, sessionImplementor);
 					Assert.That(isModified, Is.False, "Checking same component failed");
-					isModified = await (componentType.IsModifiedAsync(new Address("1", "A", "B"), person.Address, checkable, sessionImplementor, CancellationToken.None));
+					isModified = componentType.IsModified(new Address("1", "A", "B"), person.Address, checkable, sessionImplementor);
 					Assert.That(isModified, Is.False, "Checking equal component failed");
 				}
 				await (transaction.RollbackAsync());

src/NHibernate.Test/Async/NHSpecificTest/GH1496/AuditEventListener.cs

@@ -18,20 +18,28 @@ namespace NHibernate.Test.NHSpecificTest.GH1496
 	public partial class AuditEventListener : IPostUpdateEventListener
 	{
 
-		public async Task OnPostUpdateAsync(PostUpdateEvent @event, CancellationToken cancellationToken)
+		public Task OnPostUpdateAsync(PostUpdateEvent @event, CancellationToken cancellationToken)
 		{
-			if (isActive == false)
-			{ return; }
-
-			var modifiedItems = await (@event.Persister.FindModifiedAsync(@event.OldState, @event.State, @event.Entity, @event.Session, cancellationToken));
-			foreach (int index in modifiedItems)
+			try
 			{
-				ModifiedItems.Add(new Item
+				if (isActive == false)
+				{ return Task.CompletedTask; }
+
+				var modifiedItems = @event.Persister.FindModified(@event.OldState, @event.State, @event.Entity, @event.Session);
+				foreach (int index in modifiedItems)
+				{
+					ModifiedItems.Add(new Item
 				{
 					Index = index,
 					OldState = @event.OldState[index],
 					State = @event.State[index]
 				});
+				}
+				return Task.CompletedTask;
+			}
+			catch (System.Exception ex)
+			{
+				return Task.FromException<object>(ex);
 			}
 		}
 	}

src/NHibernate.Test/Async/TypesTest/Int64TypeFixture.cs

@@ -41,21 +41,6 @@ public async Task SeedAsync()
 			Assert.IsTrue(await (type.SeedAsync(null, CancellationToken.None)) is Int64, "seed should be int64");
 		}
 
-		[Test]
-		public async Task NullableWrapperDirtyAsync()
-		{
-			Int64Type type = NHibernateUtil.Int64;
-
-			long? nullLong = null;
-			long? valueLong = 5;
-			long? fiveAgain = 5;
-			using (ISession s = OpenSession())
-			{
-				Assert.IsTrue(await (type.IsDirtyAsync(nullLong, valueLong, (ISessionImplementor)s, CancellationToken.None)), "should be dirty - null to '5'");
-				Assert.IsFalse(await (type.IsDirtyAsync(valueLong, fiveAgain, (ISessionImplementor)s, CancellationToken.None)), "should not be dirty - 5 to 5");
-			}
-		}
-
 		protected override string[] Mappings => Array.Empty<string>();
 	}
 }

src/NHibernate/Async/Collection/AbstractPersistentCollection.cs

@@ -185,15 +185,15 @@ protected virtual async Task<ICollection> GetOrphansAsync(ICollection oldElement
 			{
 				if (current != null && await (ForeignKeys.IsNotTransientSlowAsync(entityName, current, session, cancellationToken)).ConfigureAwait(false))
 				{
-					object currentId = await (ForeignKeys.GetEntityIdentifierIfNotUnsavedAsync(entityName, current, session, cancellationToken)).ConfigureAwait(false);
+					object currentId = ForeignKeys.GetEntityIdentifierIfNotUnsaved(entityName, current, session);
 					currentIds.Add(new TypedValue(idType, currentId, false));
 				}
 			}
 
 			// iterate over the *old* list
 			foreach (object old in oldElements)
 			{
-				object oldId = await (ForeignKeys.GetEntityIdentifierIfNotUnsavedAsync(entityName, old, session, cancellationToken)).ConfigureAwait(false);
+				object oldId = ForeignKeys.GetEntityIdentifierIfNotUnsaved(entityName, old, session);
 				if (!currentIds.Contains(new TypedValue(idType, oldId, false)))
 				{
 					res.Add(old);
@@ -210,15 +210,15 @@ public async Task IdentityRemoveAsync(IList list, object obj, string entityName,
 			{
 				IType idType = session.Factory.GetEntityPersister(entityName).IdentifierType;
 
-				object idOfCurrent = await (ForeignKeys.GetEntityIdentifierIfNotUnsavedAsync(entityName, obj, session, cancellationToken)).ConfigureAwait(false);
+				object idOfCurrent = ForeignKeys.GetEntityIdentifierIfNotUnsaved(entityName, obj, session);
 				List<object> toRemove = new List<object>(list.Count);
 				foreach (object current in list)
 				{
 					if (current == null)
 					{
 						continue;
 					}
-					object idOfOld = await (ForeignKeys.GetEntityIdentifierIfNotUnsavedAsync(entityName, current, session, cancellationToken)).ConfigureAwait(false);
+					object idOfOld = ForeignKeys.GetEntityIdentifierIfNotUnsaved(entityName, current, session);
 					if (idType.IsEqual(idOfCurrent, idOfOld, session.Factory))
 					{
 						toRemove.Add(current);
@@ -239,13 +239,6 @@ public async Task IdentityRemoveAsync(IList list, object obj, string entityName,
 		/// <returns></returns>
 		public abstract Task<object> DisassembleAsync(ICollectionPersister persister, CancellationToken cancellationToken);
 
-		/// <summary>
-		/// Get all the elements that need deleting
-		/// </summary>
-		public abstract Task<IEnumerable> GetDeletesAsync(ICollectionPersister persister, bool indexIsFormula, CancellationToken cancellationToken);
-
-		public abstract Task<bool> EqualsSnapshotAsync(ICollectionPersister persister, CancellationToken cancellationToken);
-
 		/// <summary>
 		/// Read the state of the collection from a disassembled cached value.
 		/// </summary>
@@ -255,16 +248,6 @@ public async Task IdentityRemoveAsync(IList list, object obj, string entityName,
 		/// <param name="cancellationToken">A cancellation token that can be used to cancel the work</param>
 		public abstract Task InitializeFromCacheAsync(ICollectionPersister persister, object disassembled, object owner, CancellationToken cancellationToken);
 
-		/// <summary>
-		/// Do we need to update this element?
-		/// </summary>
-		/// <param name="entry"></param>
-		/// <param name="i"></param>
-		/// <param name="elemType"></param>
-		/// <param name="cancellationToken">A cancellation token that can be used to cancel the work</param>
-		/// <returns></returns>
-		public abstract Task<bool> NeedsUpdatingAsync(object entry, int i, IType elemType, CancellationToken cancellationToken);
-
 		/// <summary>
 		/// Reads the row from the <see cref="DbDataReader"/>.
 		/// </summary>
@@ -276,15 +259,5 @@ public async Task IdentityRemoveAsync(IList list, object obj, string entityName,
 		/// <returns>The object that was contained in the row.</returns>
 		public abstract Task<object> ReadFromAsync(DbDataReader reader, ICollectionPersister role, ICollectionAliases descriptor,
 										object owner, CancellationToken cancellationToken);
-
-		/// <summary>
-		/// Do we need to insert this element?
-		/// </summary>
-		/// <param name="entry"></param>
-		/// <param name="i"></param>
-		/// <param name="elemType"></param>
-		/// <param name="cancellationToken">A cancellation token that can be used to cancel the work</param>
-		/// <returns></returns>
-		public abstract Task<bool> NeedsInsertingAsync(object entry, int i, IType elemType, CancellationToken cancellationToken);
 	}
 }

src/NHibernate/Async/Collection/Generic/PersistentGenericBag.cs

@@ -44,38 +44,6 @@ public override async Task<object> DisassembleAsync(ICollectionPersister persist
 			return result;
 		}
 
-		public override Task<bool> EqualsSnapshotAsync(ICollectionPersister persister, CancellationToken cancellationToken)
-		{
-			if (cancellationToken.IsCancellationRequested)
-			{
-				return Task.FromCanceled<bool>(cancellationToken);
-			}
-			try
-			{
-				return Task.FromResult<bool>(EqualsSnapshot(persister));
-			}
-			catch (Exception ex)
-			{
-				return Task.FromException<bool>(ex);
-			}
-		}
-
-		public override Task<IEnumerable> GetDeletesAsync(ICollectionPersister persister, bool indexIsFormula, CancellationToken cancellationToken)
-		{
-			if (cancellationToken.IsCancellationRequested)
-			{
-				return Task.FromCanceled<IEnumerable>(cancellationToken);
-			}
-			try
-			{
-				return Task.FromResult<IEnumerable>(GetDeletes(persister, indexIsFormula));
-			}
-			catch (Exception ex)
-			{
-				return Task.FromException<IEnumerable>(ex);
-			}
-		}
-
 		public override Task<ICollection> GetOrphansAsync(object snapshot, string entityName, CancellationToken cancellationToken)
 		{
 			if (cancellationToken.IsCancellationRequested)
@@ -116,38 +84,6 @@ public override async Task InitializeFromCacheAsync(ICollectionPersister persist
 			}
 		}
 
-		public override Task<bool> NeedsInsertingAsync(object entry, int i, IType elemType, CancellationToken cancellationToken)
-		{
-			if (cancellationToken.IsCancellationRequested)
-			{
-				return Task.FromCanceled<bool>(cancellationToken);
-			}
-			try
-			{
-				return Task.FromResult<bool>(NeedsInserting(entry, i, elemType));
-			}
-			catch (Exception ex)
-			{
-				return Task.FromException<bool>(ex);
-			}
-		}
-
-		public override Task<bool> NeedsUpdatingAsync(object entry, int i, IType elemType, CancellationToken cancellationToken)
-		{
-			if (cancellationToken.IsCancellationRequested)
-			{
-				return Task.FromCanceled<bool>(cancellationToken);
-			}
-			try
-			{
-				return Task.FromResult<bool>(NeedsUpdating(entry, i, elemType));
-			}
-			catch (Exception ex)
-			{
-				return Task.FromException<bool>(ex);
-			}
-		}
-
 		public override async Task<object> ReadFromAsync(DbDataReader reader, ICollectionPersister role, ICollectionAliases descriptor, object owner, CancellationToken cancellationToken)
 		{
 			cancellationToken.ThrowIfCancellationRequested();

src/NHibernate/Async/Collection/Generic/PersistentGenericIdentifierBag.cs

@@ -66,80 +66,6 @@ public override async Task<object> DisassembleAsync(ICollectionPersister persist
 			return result;
 		}
 
-		public override async Task<bool> EqualsSnapshotAsync(ICollectionPersister persister, CancellationToken cancellationToken)
-		{
-			cancellationToken.ThrowIfCancellationRequested();
-			IType elementType = persister.ElementType;
-			var snap = (ISet<SnapshotElement>)GetSnapshot();
-			if (snap.Count != _values.Count)
-			{
-				return false;
-			}
-			for (int i = 0; i < _values.Count; i++)
-			{
-				object val = _values[i];
-				object id = GetIdentifier(i);
-				object old = snap.Where(x => Equals(x.Id, id)).Select(x => x.Value).FirstOrDefault();
-				if (await (elementType.IsDirtyAsync(old, val, Session, cancellationToken)).ConfigureAwait(false))
-				{
-					return false;
-				}
-			}
-
-			return true;
-		}
-
-		public override Task<IEnumerable> GetDeletesAsync(ICollectionPersister persister, bool indexIsFormula, CancellationToken cancellationToken)
-		{
-			if (cancellationToken.IsCancellationRequested)
-			{
-				return Task.FromCanceled<IEnumerable>(cancellationToken);
-			}
-			try
-			{
-				return Task.FromResult<IEnumerable>(GetDeletes(persister, indexIsFormula));
-			}
-			catch (Exception ex)
-			{
-				return Task.FromException<IEnumerable>(ex);
-			}
-		}
-
-		public override Task<bool> NeedsInsertingAsync(object entry, int i, IType elemType, CancellationToken cancellationToken)
-		{
-			if (cancellationToken.IsCancellationRequested)
-			{
-				return Task.FromCanceled<bool>(cancellationToken);
-			}
-			try
-			{
-				return Task.FromResult<bool>(NeedsInserting(entry, i, elemType));
-			}
-			catch (Exception ex)
-			{
-				return Task.FromException<bool>(ex);
-			}
-		}
-
-		public override async Task<bool> NeedsUpdatingAsync(object entry, int i, IType elemType, CancellationToken cancellationToken)
-		{
-			cancellationToken.ThrowIfCancellationRequested();
-			if (entry == null)
-			{
-				return false;
-			}
-			var snap = (ISet<SnapshotElement>)GetSnapshot();
-
-			object id = GetIdentifier(i);
-			if (id == null)
-			{
-				return false;
-			}
-
-			object old = snap.Where(x => Equals(x.Id, id)).Select(x => x.Value).FirstOrDefault();
-			return old != null && await (elemType.IsDirtyAsync(old, entry, Session, cancellationToken)).ConfigureAwait(false);
-		}
-
 		public override async Task<object> ReadFromAsync(DbDataReader reader, ICollectionPersister persister, ICollectionAliases descriptor, object owner, CancellationToken cancellationToken)
 		{
 			cancellationToken.ThrowIfCancellationRequested();