Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

fix(lambda): list changed durable operations in creation order (#5328)

TATSUNO “Taz” Yasuhiro9c2db353f15a
diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/durable/DurableExecutionService.java b/src/main/java/io/github/hectorvent/floci/services/lambda/durable/DurableExecutionService.java
index 3d8adf898c..1cd67b777b 100644
--- a/src/main/java/io/github/hectorvent/floci/services/lambda/durable/DurableExecutionService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/durable/DurableExecutionService.java
@@ -34,7 +34,6 @@ import java.nio.charset.StandardCharsets;
import java.time.Clock;
import java.time.Duration;
import java.util.ArrayList;
-import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
@@ -1035,10 +1034,10 @@ public class DurableExecutionService implements Resettable {
.orElseThrow(() -> new AwsException("ResourceNotFoundException", NOT_FOUND, 404));
}
+ /** In creation order, as AWS lists them, not in the order they changed. */
private static List<DurableOperation> unseenOperations(DurableExecution execution) {
return execution.getOperations().values().stream()
.filter(operation -> operation.getChangeSequence() > execution.getSeenSequence())
- .sorted(Comparator.comparingLong(DurableOperation::getChangeSequence))
.toList();
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/durable/DurableExecutionServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/durable/DurableExecutionServiceTest.java
index 128ceed0eb..1fd42ec230 100644
--- a/src/test/java/io/github/hectorvent/floci/services/lambda/durable/DurableExecutionServiceTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/durable/DurableExecutionServiceTest.java
@@ -207,6 +207,20 @@ class DurableExecutionServiceTest {
assertEquals("\"r\"", execution.getResult(), "the checkpointed result wins over the handler return");
}
+ @Test
+ void theCheckpointAnswerListsOperationsInCreationOrder() {
+ invoker.script(event -> {
+ String next = checkpoint(event, token(event), List.of(step("s1", DurableOperationAction.START, null, null)))
+ .checkpointToken();
+ CheckpointResult answer = checkpoint(event, next, List.of(step("s2", DurableOperationAction.START, null,
+ null), step("s1", DurableOperationAction.SUCCEED, "1", null)));
+ assertEquals(List.of("s1", "s2"), answer.newExecutionState().stream().map(DurableOperation::getId).toList());
+ return succeeded("");
+ });
+
+ start("exec-1", "{}", false);
+ }
+
@Test
void aClosingCheckpointEndsTheInvocationAndTheHandlerReturnIsIgnored() {
List<CheckpointResult> closing = new ArrayList<>();