Removed result from StoredFlow

stidsborg · stidsborg · commit 0cdab183ea55 · 2025-10-19T10:12:18.000+02:00
diff --git a/Core/Cleipnir.ResilientFunctions.Tests/TestTemplates/FunctionTests/ControlPanelTests.cs b/Core/Cleipnir.ResilientFunctions.Tests/TestTemplates/FunctionTests/ControlPanelTests.cs
@@ -359,11 +359,14 @@ protected async Task SucceedingExistingFunctionFromControlPanelSucceeds(Task<IFu
         await controlPanel.Refresh();
         controlPanel.Status.ShouldBe(Status.Succeeded);
         controlPanel.Result.ShouldBe("hello world");
-        
-        var sf = await store.GetFunction(rFunc.MapToStoredId(functionId.Instance));
+
+        var storedId = rFunc.MapToStoredId(functionId.Instance);
+        var sf = await store.GetFunction(storedId);
         sf.ShouldNotBeNull();
         sf.Status.ShouldBe(Status.Succeeded);
-        var result = DefaultSerializer.Instance.Deserialize<string>(sf.Result!);
+        var results = await store.GetResults([storedId]);
+        var resultBytes = results[storedId];
+        var result = DefaultSerializer.Instance.Deserialize<string>(resultBytes!);
         result.ShouldBe("hello world");
         
         unhandledExceptionCatcher.ShouldNotHaveExceptions();
diff --git a/Core/Cleipnir.ResilientFunctions.Tests/TestTemplates/FunctionTests/ReInvocationTests.cs b/Core/Cleipnir.ResilientFunctions.Tests/TestTemplates/FunctionTests/ReInvocationTests.cs
@@ -193,10 +193,13 @@ protected async Task FuncReInvocationSunshineScenario(Task<IFunctionStore> store
         var controlPanel = await rFunc.ControlPanel(flowInstance).ShouldNotBeNullAsync();
         await controlPanel.Restart();
 
-        var function = await store.GetFunction(rFunc.MapToStoredId(functionId.Instance));
+        var storedId = rFunc.MapToStoredId(functionId.Instance);
+        var function = await store.GetFunction(storedId);
         function.ShouldNotBeNull();
         function.Status.ShouldBe(Status.Succeeded);
-        function.Result!.ToStringFromUtf8Bytes().DeserializeFromJsonTo<string>().ShouldBe("something");
+        var results = await store.GetResults([storedId]);
+        var resultBytes = results[storedId];
+        resultBytes!.ToStringFromUtf8Bytes().DeserializeFromJsonTo<string>().ShouldBe("something");
         
         unhandledExceptionCatcher.ShouldNotHaveExceptions();
     }
diff --git a/Core/Cleipnir.ResilientFunctions.Tests/TestTemplates/FunctionTests/ScheduleReInvocationTests.cs b/Core/Cleipnir.ResilientFunctions.Tests/TestTemplates/FunctionTests/ScheduleReInvocationTests.cs
@@ -99,14 +99,17 @@ protected async Task FuncReInvocationSunshineScenario(Task<IFunctionStore> store
         var controlPanel = await rFunc.ControlPanel(flowInstance).ShouldNotBeNullAsync();
         await controlPanel.ScheduleRestart();
 
+        var storedId = rFunc.MapToStoredId(functionId.Instance);
         await BusyWait.Until(
-            () => store.GetFunction(rFunc.MapToStoredId(functionId.Instance)).Map(sf => sf?.Status == Status.Succeeded)
+            () => store.GetFunction(storedId).Map(sf => sf?.Status == Status.Succeeded)
         );
 
-        var function = await store.GetFunction(rFunc.MapToStoredId(functionId.Instance));
+        var function = await store.GetFunction(storedId);
         function.ShouldNotBeNull();
         function.Status.ShouldBe(Status.Succeeded);
-        function.Result!.ToStringFromUtf8Bytes().DeserializeFromJsonTo<string>().ShouldBe("something");
+        var results = await store.GetResults([storedId]);
+        var resultBytes = results[storedId];
+        resultBytes!.ToStringFromUtf8Bytes().DeserializeFromJsonTo<string>().ShouldBe("something");
         
         unhandledExceptionCatcher.ShouldNotHaveExceptions();
     }
diff --git a/Core/Cleipnir.ResilientFunctions.Tests/TestTemplates/FunctionTests/SunshineTests.cs b/Core/Cleipnir.ResilientFunctions.Tests/TestTemplates/FunctionTests/SunshineTests.cs
@@ -43,13 +43,14 @@ async Task<string> ToUpper(string s)
         var result = await rFunc("hello", "hello");
         result.ShouldBe("HELLO");
             
-        var storedFunction = await store.GetFunction(
-            reg.MapToStoredId("hello".ToFlowInstance())
-        );
+        var storedId = reg.MapToStoredId("hello".ToFlowInstance());
+        var storedFunction = await store.GetFunction(storedId);
         storedFunction.ShouldNotBeNull();
         storedFunction.Status.ShouldBe(Status.Succeeded);
-        storedFunction.Result.ShouldNotBeNull();
-        var storedResult = storedFunction.Result.ToStringFromUtf8Bytes().DeserializeFromJsonTo<string>();
+        var results = await store.GetResults([storedId]);
+        var resultBytes = results[storedId];
+        resultBytes.ShouldNotBeNull();
+        var storedResult = resultBytes.ToStringFromUtf8Bytes().DeserializeFromJsonTo<string>();
         storedResult.ShouldBe("HELLO");
             
         unhandledExceptionHandler.ShouldNotHaveExceptions();
@@ -75,16 +76,19 @@ public async Task SunshineScenarioParamless(Task<IFunctionStore> storeTask)
 
         await invoke("SomeInstanceId");
         flag.Position.ShouldBe(FlagPosition.Raised);
-            
-        var storedFunction = await store.GetFunction(reg.MapToStoredId("SomeInstanceId"));
+
+        var storedId = reg.MapToStoredId("SomeInstanceId");
+        var storedFunction = await store.GetFunction(storedId);
         storedFunction.ShouldNotBeNull();
         storedFunction.Status.ShouldBe(Status.Succeeded);
-        storedFunction.Result.ShouldBeNull();
+        var results = await store.GetResults([storedId]);
+        var resultBytes = results.TryGetValue(storedId, out var rb) ? rb : null;
+        resultBytes.ShouldBeNull();
         storedFunction.Parameter.ShouldBeNull();
-            
+
         unhandledExceptionHandler.ShouldNotHaveExceptions();
     }
-    
+
     public abstract Task SunshineScenarioParamlessWithResultReturnType();
     public async Task SunshineScenarioParamlessWithResultReturnType(Task<IFunctionStore> storeTask)
     {
@@ -106,16 +110,19 @@ public async Task SunshineScenarioParamlessWithResultReturnType(Task<IFunctionSt
 
         await invoke("SomeInstanceId");
         flag.Position.ShouldBe(FlagPosition.Raised);
-            
-        var storedFunction = await store.GetFunction(reg.MapToStoredId("SomeInstanceId"));
+
+        var storedId = reg.MapToStoredId("SomeInstanceId");
+        var storedFunction = await store.GetFunction(storedId);
         storedFunction.ShouldNotBeNull();
         storedFunction.Status.ShouldBe(Status.Succeeded);
-        storedFunction.Result.ShouldBeNull();
+        var results = await store.GetResults([storedId]);
+        var resultBytes = results.TryGetValue(storedId, out var rb) ? rb : null;
+        resultBytes.ShouldBeNull();
         storedFunction.Parameter.ShouldBeNull();
-            
+
         unhandledExceptionHandler.ShouldNotHaveExceptions();
     }
-    
+
     public abstract Task SunshineScenarioAction();
     public async Task SunshineScenarioAction(Task<IFunctionStore> storeTask)
     {
diff --git a/Core/Cleipnir.ResilientFunctions.Tests/TestTemplates/ResilientFunctionStateTests.cs b/Core/Cleipnir.ResilientFunctions.Tests/TestTemplates/ResilientFunctionStateTests.cs
@@ -37,10 +37,13 @@ async Task<string> ToUpper(string s, Workflow workflow)
             result.ShouldBe("HELLO");
 
             var functionId = new FlowId(flowType, "hello".ToFlowInstance());
-            var storedFunction = await store.GetFunction(registration.MapToStoredId(functionId.Instance));
+            var storedId = registration.MapToStoredId(functionId.Instance);
+            var storedFunction = await store.GetFunction(storedId);
             storedFunction.ShouldNotBeNull();
-            storedFunction.Result.ShouldNotBeNull();
-            var storedResult = storedFunction.Result.ToStringFromUtf8Bytes().DeserializeFromJsonTo<string>();
+            var results = await store.GetResults([storedId]);
+            var resultBytes = results[storedId];
+            resultBytes.ShouldNotBeNull();
+            var storedResult = resultBytes.ToStringFromUtf8Bytes().DeserializeFromJsonTo<string>();
             storedResult.ShouldBe("HELLO");
             var effects = await store.EffectsStore.GetEffectResults(registration.MapToStoredId(functionId.Instance));
             effects
diff --git a/Core/Cleipnir.ResilientFunctions.Tests/TestTemplates/StoreCrudTests.cs b/Core/Cleipnir.ResilientFunctions.Tests/TestTemplates/StoreCrudTests.cs
@@ -38,7 +38,9 @@ await store.CreateFunction(
         var stored = await store.GetFunction(StoredId);
         stored!.StoredId.ShouldBe(StoredId);
         stored.Parameter.ShouldBe(Param.ToUtf8Bytes());
-        stored.Result.ShouldBeNull();
+        var results = await store.GetResults([StoredId]);
+        var resultBytes = results.TryGetValue(StoredId, out var rb) ? rb : null;
+        resultBytes.ShouldBeNull();
         stored.Status.ShouldBe(Status.Executing);
         stored.Expires.ShouldBe(leaseExpiration);
     }
@@ -62,11 +64,13 @@ await store.CreateFunction(
         var stored = await store.GetFunction(StoredId);
         stored!.StoredId.ShouldBe(StoredId);
         stored.Parameter.ShouldBe(Param.ToUtf8Bytes());
-        stored.Result.ShouldBeNull();
+        var results = await store.GetResults([StoredId]);
+        var resultBytes = results.TryGetValue(StoredId, out var rb) ? rb : null;
+        resultBytes.ShouldBeNull();
         stored.Status.ShouldBe(Status.Executing);
         stored.Expires.ShouldBe(leaseExpiration);
     }
-        
+
     public abstract Task FunctionCanBeCreatedWithTwoParametersAndStateSuccessfully();
     protected async Task FunctionCanBeCreatedWithTwoParametersAndStateSuccessfully(Task<IFunctionStore> storeTask)
     {
@@ -86,7 +90,9 @@ await store.CreateFunction(
         var stored = await store.GetFunction(StoredId);
         stored!.StoredId.ShouldBe(StoredId);
         stored.Parameter.ShouldBe(Param.ToUtf8Bytes());
-        stored.Result.ShouldBeNull();
+        var results = await store.GetResults([StoredId]);
+        var resultBytes = results.TryGetValue(StoredId, out var rb) ? rb : null;
+        resultBytes.ShouldBeNull();
         stored.Status.ShouldBe(Status.Executing);
         stored.Expires.ShouldBe(leaseExpiration);
     }
diff --git a/Core/Cleipnir.ResilientFunctions.Tests/TestTemplates/StoreTests.cs b/Core/Cleipnir.ResilientFunctions.Tests/TestTemplates/StoreTests.cs
@@ -60,8 +60,10 @@ await store.SucceedFunction(
             
         storedFunction = await store.GetFunction(functionId);
         storedFunction.ShouldNotBeNull();
-        storedFunction.Result.ShouldNotBeNull();
-        storedFunction.Result.ToStringFromUtf8Bytes().DeserializeFromJsonTo<string>().ShouldBe(result);
+        var results = await store.GetResults([functionId]);
+        var resultBytes = results[functionId];
+        resultBytes.ShouldNotBeNull();
+        resultBytes.ToStringFromUtf8Bytes().DeserializeFromJsonTo<string>().ShouldBe(result);
     }
     
     public abstract Task NullParamScenarioTest();
diff --git a/Core/Cleipnir.ResilientFunctions.Tests/TestTemplates/WatchDogsTests/InitialInvocationFailedTests.cs b/Core/Cleipnir.ResilientFunctions.Tests/TestTemplates/WatchDogsTests/InitialInvocationFailedTests.cs
@@ -108,10 +108,12 @@ await store.CreateFunction(
         
         await flag.WaitForRaised();
 
+        var storedId = registration.MapToStoredId(functionId.Instance);
         await BusyWait.Until(
-            () => store.GetFunction(registration.MapToStoredId(functionId.Instance)).Map(sf => sf?.Status == Status.Succeeded)
+            () => store.GetFunction(storedId).Map(sf => sf?.Status == Status.Succeeded)
         );
-        var resultJson = await store.GetFunction(registration.MapToStoredId(functionId.Instance)).Map(sf => sf?.Result);
+        var results = await store.GetResults([storedId]);
+        var resultJson = results[storedId];
         resultJson.ShouldNotBeNull();
         JsonConvert.DeserializeObject<string>(resultJson.ToStringFromUtf8Bytes()).ShouldBe("HELLO WORLD");
     }
@@ -145,11 +147,13 @@ await store.CreateFunction(
         
         await flag.WaitForRaised();
 
+        var storedId = registration.MapToStoredId(functionId.Instance);
         await BusyWait.Until(
-            () => store.GetFunction(registration.MapToStoredId(functionId.Instance)).Map(sf => sf?.Status == Status.Succeeded)
+            () => store.GetFunction(storedId).Map(sf => sf?.Status == Status.Succeeded)
         );
-        
-        var resultJson = await store.GetFunction(registration.MapToStoredId(functionId.Instance)).Map(sf => sf?.Result);
+
+        var results = await store.GetResults([storedId]);
+        var resultJson = results[storedId];
         resultJson.ShouldNotBeNull();
         JsonConvert.DeserializeObject<string>(resultJson.ToStringFromUtf8Bytes()).ShouldBe("HELLO WORLD");
     }
diff --git a/Core/Cleipnir.ResilientFunctions.Tests/TestTemplates/WatchDogsTests/WatchdogCompoundTests.cs b/Core/Cleipnir.ResilientFunctions.Tests/TestTemplates/WatchDogsTests/WatchdogCompoundTests.cs
@@ -118,12 +118,15 @@ public async Task FunctionCompoundTest(Task<IFunctionStore> storeTask)
                 (Param p) => $"{p.Id}-{p.Value}".ToTask()
             );
 
+            var storedId = registration.MapToStoredId(functionId.Instance);
             await BusyWait.Until(async () =>
-                await store.GetFunction(registration.MapToStoredId(functionId.Instance)).Map(sf => sf!.Status) == Status.Succeeded
+                await store.GetFunction(storedId).Map(sf => sf!.Status) == Status.Succeeded
             );
-            
-            var storedFunction = await store.GetFunction(registration.MapToStoredId(functionId.Instance));
-            storedFunction!.Result!.ToStringFromUtf8Bytes().DeserializeFromJsonTo<string>().CastTo<string>().ShouldBe($"{param.Id}-{param.Value}");
+
+            var storedFunction = await store.GetFunction(storedId);
+            var results = await store.GetResults([storedId]);
+            var resultBytes = results[storedId];
+            resultBytes!.ToStringFromUtf8Bytes().DeserializeFromJsonTo<string>().CastTo<string>().ShouldBe($"{param.Id}-{param.Value}");
         }
     }
 
diff --git a/Core/Cleipnir.ResilientFunctions/CoreRuntime/Invocation/InvocationHelper.cs b/Core/Cleipnir.ResilientFunctions/CoreRuntime/Invocation/InvocationHelper.cs
@@ -328,22 +328,25 @@ public async Task Interrupt(IReadOnlyList<StoredId> storedIds)
     public async Task<FunctionState<TParam, TReturn>?> GetFunction(StoredId storedId, FlowId flowId)
     {
         var sf = await _functionStore.GetFunction(storedId);
-        if (sf == null) 
+        if (sf == null)
             return null;
 
+        var results = await _functionStore.GetResults([storedId]);
+        var resultBytes = results.TryGetValue(storedId, out var rb) ? rb : null;
+
         return new FunctionState<TParam, TReturn>(
             sf.Status,
             sf.Expires,
             sf.OwnerId,
             Param:
-                sf.Parameter == null 
+                sf.Parameter == null
                 ? default
                 : Serializer.Deserialize<TParam>(sf.Parameter),
-            Result: sf.Result == null 
-                ? default 
-                : Serializer.Deserialize<TReturn>(sf.Result),
-            FatalWorkflowException: sf.Exception == null 
-                ? null 
+            Result: resultBytes == null
+                ? default
+                : Serializer.Deserialize<TReturn>(resultBytes),
+            FatalWorkflowException: sf.Exception == null
+                ? null
                 : Serializer.DeserializeException(flowId, sf.Exception)
         );
     }
diff --git a/Core/Cleipnir.ResilientFunctions/CoreRuntime/Invocation/ResultBusyWaiter.cs b/Core/Cleipnir.ResilientFunctions/CoreRuntime/Invocation/ResultBusyWaiter.cs
@@ -10,14 +10,14 @@ namespace Cleipnir.ResilientFunctions.CoreRuntime.Invocation;
 
 public class ResultBusyWaiter<TResult>(IFunctionStore functionStore, ISerializer serializer)
 {
-    public async Task<TResult> WaitForFunctionResult(FlowId flowId, StoredId storedId, bool allowPostponedAndSuspended, TimeSpan? maxWait) 
+    public async Task<TResult> WaitForFunctionResult(FlowId flowId, StoredId storedId, bool allowPostponedAndSuspended, TimeSpan? maxWait)
     {
         var stopWatch = Stopwatch.StartNew();
         while (true)
         {
             if (maxWait.HasValue && stopWatch.Elapsed > maxWait.Value)
                 throw new TimeoutException();
-            
+
             var storedFunction = await functionStore.GetFunction(storedId);
             if (storedFunction == null)
                 throw UnexpectedStateException.NotFound(storedId);
@@ -28,10 +28,12 @@ public async Task<TResult> WaitForFunctionResult(FlowId flowId, StoredId storedI
                     await Task.Delay(250);
                     continue;
                 case Status.Succeeded:
-                    return 
-                        storedFunction.Result == null 
+                    var results = await functionStore.GetResults([storedId]);
+                    var result = results.TryGetValue(storedId, out var resultBytes) ? resultBytes : null;
+                    return
+                        result == null
                             ? default!
-                            : serializer.Deserialize<TResult>(storedFunction.Result);
+                            : serializer.Deserialize<TResult>(result);
                 case Status.Failed:
                     throw serializer.DeserializeException(flowId, storedFunction.Exception!);
                 case Status.Postponed:
@@ -44,7 +46,7 @@ public async Task<TResult> WaitForFunctionResult(FlowId flowId, StoredId storedI
                     if (allowPostponedAndSuspended) { await Task.Delay(250); continue; }
                     throw new InvocationSuspendedException(flowId);
                 default:
-                    throw new ArgumentOutOfRangeException(); 
+                    throw new ArgumentOutOfRangeException();
             }
         }
     }
diff --git a/Core/Cleipnir.ResilientFunctions/Storage/InMemoryFunctionStore.cs b/Core/Cleipnir.ResilientFunctions/Storage/InMemoryFunctionStore.cs
@@ -433,7 +433,6 @@ public async Task<IReadOnlyList<StatusAndId>> GetFunctionsStatus(IEnumerable<Sto
                     state.HumanInstanceId,
                     state.Param,
                     state.Status,
-                    state.Result,
                     state.Exception,
                     state.Expires,
                     state.Timestamp,
diff --git a/Core/Cleipnir.ResilientFunctions/Storage/Types.cs b/Core/Cleipnir.ResilientFunctions/Storage/Types.cs
@@ -92,7 +92,6 @@ public record StoredFlow(
     string InstanceId,
     byte[]? Parameter,
     Status Status,
-    byte[]? Result,
     StoredException? Exception,
     long Expires,
     long Timestamp,
diff --git a/Stores/MariaDB/Cleipnir.ResilientFunctions.MariaDB/MariaDbFunctionStore.cs b/Stores/MariaDB/Cleipnir.ResilientFunctions.MariaDB/MariaDbFunctionStore.cs
@@ -726,11 +726,10 @@ SELECT instance
                 InstanceId: reader.GetString(humanInstanceIdIndex),
                 hasParam ? (byte[]) reader.GetValue(paramIndex) : null,
                 Status: (Status) reader.GetInt32(statusIndex),
-                Result: hasResult ? (byte[]) reader.GetValue(resultIndex) : null, 
-                storedException, 
+                storedException,
                 Expires: reader.GetInt64(expiresIndex),
-                Interrupted: reader.GetBoolean(interruptedIndex),
                 Timestamp: reader.GetInt64(timestampIndex),
+                Interrupted: reader.GetBoolean(interruptedIndex),
                 ParentId: hasParent ? StoredId.Deserialize(reader.GetString(parentIndex)) : null,
                 OwnerId: hasOwner ? reader.GetString(ownerIndex).ParseToReplicaId() : null,
                 StoredType: storedId.Type
diff --git a/Stores/MariaDB/Cleipnir.ResilientFunctions.MariaDB/SqlGenerator.cs b/Stores/MariaDB/Cleipnir.ResilientFunctions.MariaDB/SqlGenerator.cs
@@ -378,11 +378,10 @@ public StoreCommand RestartExecution(StoredId storedId, ReplicaId replicaId)
                 InstanceId: reader.GetString(humanInstanceIdIndex),
                 hasParam ? (byte[]) reader.GetValue(paramIndex) : null,
                 Status: (Status) reader.GetInt32(statusIndex),
-                Result: hasResult ? (byte[]) reader.GetValue(resultIndex) : null, 
-                storedException, 
+                storedException,
                 Expires: reader.GetInt64(expiresIndex),
-                Interrupted: reader.GetBoolean(interruptedIndex),
                 Timestamp: reader.GetInt64(timestampIndex),
+                Interrupted: reader.GetBoolean(interruptedIndex),
                 ParentId: hasParent ? StoredId.Deserialize(reader.GetString(parentIndex)) : null,
                 OwnerId: hasOwner ? reader.GetString(ownerIndex).ParseToReplicaId() : null,
                 StoredType: storedId.Type
diff --git a/Stores/PostgreSQL/Cleipnir.ResilientFunctions.PostgreSQL/PostgreSqlFunctionStore.cs b/Stores/PostgreSQL/Cleipnir.ResilientFunctions.PostgreSQL/PostgreSqlFunctionStore.cs
@@ -692,11 +692,10 @@ 9 owner
                 InstanceId: reader.GetString(7),
                 hasParameter ? (byte[]) reader.GetValue(0) : null,
                 Status: (Status) reader.GetInt32(1),
-                Result: hasResult ? (byte[]) reader.GetValue(2) : null, 
                 Exception: !hasException ? null : JsonSerializer.Deserialize<StoredException>(reader.GetString(3)),
                 Expires: reader.GetInt64(4),
-                Interrupted: reader.GetBoolean(5),
                 Timestamp: reader.GetInt64(6),
+                Interrupted: reader.GetBoolean(5),
                 ParentId: hasParent ? StoredId.Deserialize(reader.GetString(8)) : null,
                 OwnerId: hasOwner ? reader.GetGuid(9).ToReplicaId() : null,
                 StoredType: storedId.Type
diff --git a/Stores/PostgreSQL/Cleipnir.ResilientFunctions.PostgreSQL/SqlGenerator.cs b/Stores/PostgreSQL/Cleipnir.ResilientFunctions.PostgreSQL/SqlGenerator.cs
@@ -372,7 +372,6 @@ 10 owner
                 humanInstanceId,
                 param,
                 status,
-                result, 
                 exception,
                 expires,
                 timestamp,
diff --git a/Stores/SqlServer/Cleipnir.ResilientFunctions.SqlServer/SqlGenerator.cs b/Stores/SqlServer/Cleipnir.ResilientFunctions.SqlServer/SqlGenerator.cs
@@ -374,7 +374,6 @@ public StoreCommand RestartExecution(StoredId storedId, ReplicaId replicaId)
                     humanInstanceId,
                     parameter,
                     status,
-                    result,
                     storedException,
                     expires,
                     timestamp,
diff --git a/Stores/SqlServer/Cleipnir.ResilientFunctions.SqlServer/SqlServerFunctionStore.cs b/Stores/SqlServer/Cleipnir.ResilientFunctions.SqlServer/SqlServerFunctionStore.cs
