Prevent calling UpdateTimestampsCache if query spaces are not changed (nhibernate#2120)

Author: hazzik

src/NHibernate/Async/Cache/StandardQueryCache.cs

@@ -470,6 +470,9 @@ protected virtual Task<bool> IsUpToDateAsync(ISet<string> spaces, long timestamp
 {
 return Task.FromCanceled<bool>(cancellationToken);
 }
+if (spaces.Count == 0)
+return Task.FromResult<bool>(true);
+
 return _updateTimestampsCache.IsUpToDateAsync(spaces, timestamp, cancellationToken);
 }
 }

src/NHibernate/Async/Cache/UpdateTimestampsCache.cs

@@ -116,13 +116,9 @@ private Task SetSpacesTimestampAsync(IReadOnlyCollection<string> spaces, long ts
 if (spaces.Count == 0)
 return Task.CompletedTask;
 
-var timestamps = new object[spaces.Count];
-for (var i = 0; i < timestamps.Length; i++)
-{
-timestamps[i] = ts;
-}
-
-return _updateTimestamps.PutManyAsync(spaces.ToArray(), timestamps, cancellationToken);
+return _updateTimestamps.PutManyAsync(
+spaces.ToArray<object>(),
+ArrayHelper.Fill<object>(ts, spaces.Count), cancellationToken);
 }
 catch (Exception ex)
 {
@@ -139,13 +135,7 @@ public virtual async Task<bool> IsUpToDateAsync(ISet<string> spaces, long timest
 if (spaces.Count == 0)
 return true;
 
-var keys = new object[spaces.Count];
-var index = 0;
-foreach (var space in spaces)
-{
-keys[index++] = space;
-}
-var lastUpdates = await (_updateTimestamps.GetManyAsync(keys, cancellationToken)).ConfigureAwait(false);
+var lastUpdates = await (_updateTimestamps.GetManyAsync(spaces.ToArray<object>(), cancellationToken)).ConfigureAwait(false);
 return lastUpdates.All(lastUpdate => !IsOutdated(lastUpdate as long?, timestamp));
 }
 }
@@ -156,36 +146,27 @@ public virtual async Task<bool[]> AreUpToDateAsync(ISet<string>[] spaces, long[]
 cancellationToken.ThrowIfCancellationRequested();
 using (await _areUpToDate.LockAsync())
 {
-var results = new bool[spaces.Length];
+if (spaces.Length == 0)
+return Array.Empty<bool>();
+
 var allSpaces = new HashSet<string>();
 foreach (var sp in spaces)
 {
 allSpaces.UnionWith(sp);
 }
 
 if (allSpaces.Count == 0)
-{
-for (var i = 0; i < spaces.Length; i++)
-{
-results[i] = true;
-}
+return ArrayHelper.Fill(true, spaces.Length);
 
-return results;
-}
+var keys = allSpaces.ToArray<object>();
 
-var keys = new object[allSpaces.Count];
 var index = 0;
-foreach (var space in allSpaces)
-{
-keys[index++] = space;
-}
-
-index = 0;
 var lastUpdatesBySpace =
 (await (_updateTimestamps
 .GetManyAsync(keys, cancellationToken)).ConfigureAwait(false))
 .ToDictionary(u => keys[index++], u => u as long?);
 
+var results = new bool[spaces.Length];
 for (var i = 0; i < spaces.Length; i++)
 {
 var timestamp = timestamps[i];

src/NHibernate/Async/Engine/ActionQueue.cs

@@ -45,7 +45,7 @@ private Task PreInvalidateCachesAsync(CancellationToken cancellationToken)
 {
 return Task.FromCanceled<object>(cancellationToken);
 }
-if (session.Factory.Settings.IsQueryCacheEnabled)
+if (session.Factory.Settings.IsQueryCacheEnabled && executedSpaces.Count > 0)
 {
 return session.Factory.UpdateTimestampsCache.PreInvalidateAsync(executedSpaces, cancellationToken);
 }
@@ -165,7 +165,7 @@ public async Task AfterTransactionCompletionAsync(bool success, CancellationToke
 private async Task InvalidateCachesAsync(CancellationToken cancellationToken)
 {
 cancellationToken.ThrowIfCancellationRequested();
-if (session.Factory.Settings.IsQueryCacheEnabled)
+if (session.Factory.Settings.IsQueryCacheEnabled && executedSpaces.Count > 0)
 {
 await (session.Factory.UpdateTimestampsCache.InvalidateAsync(executedSpaces, cancellationToken)).ConfigureAwait(false);
 }

src/NHibernate/Cache/StandardQueryCache.cs

@@ -551,6 +551,9 @@ private static ICacheAssembler[] GuessTypes(IList cacheable)
 
 protected virtual bool IsUpToDate(ISet<string> spaces, long timestamp)
 {
+if (spaces.Count == 0)
+return true;
+
 return _updateTimestampsCache.IsUpToDate(spaces, timestamp);
 }
 }

src/NHibernate/Cache/UpdateTimestampsCache.cs

@@ -88,13 +88,9 @@ private void SetSpacesTimestamp(IReadOnlyCollection<string> spaces, long ts)
 if (spaces.Count == 0)
 return;
 
-var timestamps = new object[spaces.Count];
-for (var i = 0; i < timestamps.Length; i++)
-{
-timestamps[i] = ts;
-}
-
-_updateTimestamps.PutMany(spaces.ToArray(), timestamps);
+_updateTimestamps.PutMany(
+spaces.ToArray<object>(),
+ArrayHelper.Fill<object>(ts, spaces.Count));
 }
 
 [MethodImpl(MethodImplOptions.Synchronized)]
@@ -103,49 +99,34 @@ public virtual bool IsUpToDate(ISet<string> spaces, long timestamp /* H2.1 has L
 if (spaces.Count == 0)
 return true;
 
-var keys = new object[spaces.Count];
-var index = 0;
-foreach (var space in spaces)
-{
-keys[index++] = space;
-}
-var lastUpdates = _updateTimestamps.GetMany(keys);
+var lastUpdates = _updateTimestamps.GetMany(spaces.ToArray<object>());
 return lastUpdates.All(lastUpdate => !IsOutdated(lastUpdate as long?, timestamp));
 }
 
 [MethodImpl(MethodImplOptions.Synchronized)]
 public virtual bool[] AreUpToDate(ISet<string>[] spaces, long[] timestamps)
 {
-var results = new bool[spaces.Length];
+if (spaces.Length == 0)
+return Array.Empty<bool>();
+
 var allSpaces = new HashSet<string>();
 foreach (var sp in spaces)
 {
 allSpaces.UnionWith(sp);
 }
 
 if (allSpaces.Count == 0)
-{
-for (var i = 0; i < spaces.Length; i++)
-{
-results[i] = true;
-}
+return ArrayHelper.Fill(true, spaces.Length);
 
-return results;
-}
+var keys = allSpaces.ToArray<object>();
 
-var keys = new object[allSpaces.Count];
 var index = 0;
-foreach (var space in allSpaces)
-{
-keys[index++] = space;
-}
-
-index = 0;
 var lastUpdatesBySpace =
 _updateTimestamps
 .GetMany(keys)
 .ToDictionary(u => keys[index++], u => u as long?);
 
+var results = new bool[spaces.Length];
 for (var i = 0; i < spaces.Length; i++)
 {
 var timestamp = timestamps[i];
@@ -163,7 +144,7 @@ public virtual void Destroy()
 // not the responsibility of this class.
 }
 
-private bool IsOutdated(long? lastUpdate, long timestamp)
+private static bool IsOutdated(long? lastUpdate, long timestamp)
 {
 if (!lastUpdate.HasValue)
 {

src/NHibernate/Engine/ActionQueue.cs

@@ -172,7 +172,7 @@ private void ExecuteActions<T>(List<T> list) where T: IExecutable
 
 private void PreInvalidateCaches()
 {
-if (session.Factory.Settings.IsQueryCacheEnabled)
+if (session.Factory.Settings.IsQueryCacheEnabled && executedSpaces.Count > 0)
 {
 session.Factory.UpdateTimestampsCache.PreInvalidate(executedSpaces);
 }
@@ -294,7 +294,7 @@ public void AfterTransactionCompletion(bool success)
 
 private void InvalidateCaches()
 {
-if (session.Factory.Settings.IsQueryCacheEnabled)
+if (session.Factory.Settings.IsQueryCacheEnabled && executedSpaces.Count > 0)
 {
 session.Factory.UpdateTimestampsCache.Invalidate(executedSpaces);
 }