Replace Tuple<StoredId, long> with StoredIdAndPosition record

Introduces a named StoredIdAndPosition record (in Storage/Types.cs) for
the GetCrashedReplicaMessages result instead of the anonymous
Tuple<StoredId, long>, giving the (flow, position) pair meaningful member
names.

Author: stidsborg

Core/Cleipnir.ResilientFunctions.Tests/Messaging/TestTemplates/MessageStoreTests.cs

@@ -1232,8 +1232,8 @@ protected async Task CrashedReplicaMessagesAreFetched(Task<IFunctionStore> funct
         var crashed = await messageStore.GetCrashedReplicaMessages([liveReplica]);
 
         crashed.Count.ShouldBe(2);
-        crashed.ShouldContain(t => t.Item1 == flow1 && t.Item2 == bPosition);
-        crashed.ShouldContain(t => t.Item1 == flow2 && t.Item2 == cPosition);
+        crashed.ShouldContain(t => t.StoredId == flow1 && t.Position == bPosition);
+        crashed.ShouldContain(t => t.StoredId == flow2 && t.Position == cPosition);
     }
 
     public abstract Task MessageReplicaCanBeReassigned();

Core/Cleipnir.ResilientFunctions/Messaging/IMessageStore.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Cleipnir.ResilientFunctions.Domain;
 using Cleipnir.ResilientFunctions.Storage;
@@ -38,7 +37,7 @@ public interface IMessageStore
     /// longer alive (its replica is not contained in <paramref name="liveReplicas"/>).
     /// Used to detect messages stranded by crashed replicas so they can be re-assigned to a live replica via <see cref="SetReplica"/>.
     /// </summary>
-    Task<List<Tuple<StoredId, long>>> GetCrashedReplicaMessages(IEnumerable<ReplicaId> liveReplicas);
+    Task<List<StoredIdAndPosition>> GetCrashedReplicaMessages(IEnumerable<ReplicaId> liveReplicas);
 
     /// <summary>
     /// Re-assigns the messages at the provided positions to <paramref name="newReplica"/>,

Core/Cleipnir.ResilientFunctions/Storage/InMemoryFunctionStore.cs

@@ -688,16 +688,16 @@ public Task<Dictionary<StoredId, List<StoredMessage>>> GetMessagesForReplica(Rep
         }
     }
 
-    public Task<List<Tuple<StoredId, long>>> GetCrashedReplicaMessages(IEnumerable<ReplicaId> liveReplicas)
+    public Task<List<StoredIdAndPosition>> GetCrashedReplicaMessages(IEnumerable<ReplicaId> liveReplicas)
     {
         var live = liveReplicas.ToHashSet();
         lock (_sync)
         {
-            var result = new List<Tuple<StoredId, long>>();
+            var result = new List<StoredIdAndPosition>();
             foreach (var (storedId, messages) in _messages)
                 foreach (var (position, message) in messages.OrderBy(kv => kv.Key))
                     if (!live.Contains(message.Replica))
-                        result.Add(Tuple.Create(storedId, position));
+                        result.Add(new StoredIdAndPosition(storedId, position));
 
             return result.ToTask();
         }

Core/Cleipnir.ResilientFunctions/Storage/Types.cs

@@ -113,6 +113,8 @@ public record StoredException(string ExceptionMessage, string? ExceptionStackTra
 
 public record StatusAndId(StoredId StoredId, Status Status, long Expiry);
 
+public record StoredIdAndPosition(StoredId StoredId, long Position);
+
 public record StoredEffectChange(
     StoredId StoredId,
     EffectId EffectId,

Stores/MariaDB/Cleipnir.ResilientFunctions.MariaDB/MariaDbMessageStore.cs

@@ -212,7 +212,7 @@ public async Task<Dictionary<StoredId, List<StoredMessage>>> GetMessagesForRepli
         return storedMessages;
     }
 
-    public async Task<List<Tuple<StoredId, long>>> GetCrashedReplicaMessages(IEnumerable<ReplicaId> liveReplicas)
+    public async Task<List<StoredIdAndPosition>> GetCrashedReplicaMessages(IEnumerable<ReplicaId> liveReplicas)
     {
         await using var conn = await DatabaseHelper.CreateOpenConnection(_connectionString);
         await using var command = _sqlGenerator

Stores/MariaDB/Cleipnir.ResilientFunctions.MariaDB/SqlGenerator.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Runtime.Serialization;
 using System.Text.Json;
 using Cleipnir.ResilientFunctions.Domain;
@@ -687,14 +686,14 @@ WHERE replica IS NOT NULL{notInClause}
         return StoreCommand.Create(sql);
     }
 
-    public async Task<List<Tuple<StoredId, long>>> ReadStoredIdAndPositions(MySqlDataReader reader)
+    public async Task<List<StoredIdAndPosition>> ReadStoredIdAndPositions(MySqlDataReader reader)
     {
-        var result = new List<Tuple<StoredId, long>>();
+        var result = new List<StoredIdAndPosition>();
         while (await reader.ReadAsync())
         {
             var id = reader.GetString(0).ToGuid().ToStoredId();
             var position = reader.GetInt64(1);
-            result.Add(Tuple.Create(id, position));
+            result.Add(new StoredIdAndPosition(id, position));
         }
 
         return result;

Stores/PostgreSQL/Cleipnir.ResilientFunctions.PostgreSQL/PostgreSqlMessageStore.cs

@@ -211,7 +211,7 @@ public async Task<Dictionary<StoredId, List<StoredMessage>>> GetMessagesForRepli
         return storedMessages;
     }
 
-    public async Task<List<Tuple<StoredId, long>>> GetCrashedReplicaMessages(IEnumerable<ReplicaId> liveReplicas)
+    public async Task<List<StoredIdAndPosition>> GetCrashedReplicaMessages(IEnumerable<ReplicaId> liveReplicas)
     {
         await using var conn = await CreateConnection();
         await using var command = sqlGenerator.GetCrashedReplicaMessages(liveReplicas).ToNpgsqlCommand(conn);

Stores/PostgreSQL/Cleipnir.ResilientFunctions.PostgreSQL/SqlGenerator.cs

@@ -606,14 +606,14 @@ public StoreCommand GetCrashedReplicaMessages(IEnumerable<ReplicaId> liveReplica
         return StoreCommand.Create(sql, values: [ liveReplicas.Select(r => r.AsGuid).ToArray() ]);
     }
 
-    public async Task<List<Tuple<StoredId, long>>> ReadStoredIdAndPositions(NpgsqlDataReader reader)
+    public async Task<List<StoredIdAndPosition>> ReadStoredIdAndPositions(NpgsqlDataReader reader)
     {
-        var result = new List<Tuple<StoredId, long>>();
+        var result = new List<StoredIdAndPosition>();
         while (await reader.ReadAsync())
         {
             var id = reader.GetGuid(0).ToStoredId();
             var position = reader.GetInt64(1);
-            result.Add(Tuple.Create(id, position));
+            result.Add(new StoredIdAndPosition(id, position));
         }
 
         return result;

Stores/SqlServer/Cleipnir.ResilientFunctions.SqlServer/SqlGenerator.cs

@@ -693,14 +693,14 @@ WHERE Replica IS NOT NULL{notInClause}
         return command;
     }
 
-    public async Task<List<Tuple<StoredId, long>>> ReadStoredIdAndPositions(SqlDataReader reader)
+    public async Task<List<StoredIdAndPosition>> ReadStoredIdAndPositions(SqlDataReader reader)
     {
-        var result = new List<Tuple<StoredId, long>>();
+        var result = new List<StoredIdAndPosition>();
         while (await reader.ReadAsync())
         {
             var id = reader.GetGuid(0).ToStoredId();
             var position = reader.GetInt64(1);
-            result.Add(Tuple.Create(id, position));
+            result.Add(new StoredIdAndPosition(id, position));
         }
 
         return result;

Stores/SqlServer/Cleipnir.ResilientFunctions.SqlServer/SqlServerMessageStore.cs

@@ -221,7 +221,7 @@ public async Task<Dictionary<StoredId, List<StoredMessage>>> GetMessagesForRepli
         return storedMessages;
     }
 
-    public async Task<List<Tuple<StoredId, long>>> GetCrashedReplicaMessages(IEnumerable<ReplicaId> liveReplicas)
+    public async Task<List<StoredIdAndPosition>> GetCrashedReplicaMessages(IEnumerable<ReplicaId> liveReplicas)
     {
         await using var conn = await CreateConnection();
         await using var cmd = _sqlGenerator.GetCrashedReplicaMessages(liveReplicas).ToSqlCommand(conn);