(cassandra) 02/02: Fix SavedCommandTest

[ifesdjeen]

This is an automated email from the ASF dual-hosted git repository.

ifesdjeen pushed a commit to branch cep-15-accord
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit a33dea532956a697c8d87d1f4a275c8a48ad1023
Author: Alex Petrov <oleksandr.pet...@gmail.com>
AuthorDate: Mon Sep 16 18:21:00 2024 +0200

    Fix SavedCommandTest
---
 src/java/org/apache/cassandra/service/accord/SavedCommand.java | 5 +++++
 test/unit/org/apache/cassandra/utils/AccordGenerators.java     | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/java/org/apache/cassandra/service/accord/SavedCommand.java 
b/src/java/org/apache/cassandra/service/accord/SavedCommand.java
index 5f5fb9b9c9..bef75a70ef 100644
--- a/src/java/org/apache/cassandra/service/accord/SavedCommand.java
+++ b/src/java/org/apache/cassandra/service/accord/SavedCommand.java
@@ -553,6 +553,11 @@ public class SavedCommand
                 case PreAccepted:
                     return Command.PreAccepted.preAccepted(attrs, executeAt, 
promised);
                 case AcceptedInvalidate:
+                    if (saveStatus == 
SaveStatus.AcceptedInvalidateWithDefinition)
+                        return Command.Accepted.accepted(attrs, saveStatus, 
executeAt, promised, acceptedOrCommitted);
+                    else
+                        return 
Command.AcceptedInvalidateWithoutDefinition.acceptedInvalidate(attrs, promised, 
acceptedOrCommitted);
+
                 case Accepted:
                 case PreCommitted:
                     return Command.Accepted.accepted(attrs, saveStatus, 
executeAt, promised, acceptedOrCommitted);
diff --git a/test/unit/org/apache/cassandra/utils/AccordGenerators.java 
b/test/unit/org/apache/cassandra/utils/AccordGenerators.java
index 58042e2d5f..02715aa9cc 100644
--- a/test/unit/org/apache/cassandra/utils/AccordGenerators.java
+++ b/test/unit/org/apache/cassandra/utils/AccordGenerators.java
@@ -228,8 +228,10 @@ public class AccordGenerators
                     return 
Command.SerializerSupport.notDefined(attributes(saveStatus), Ballot.ZERO);
                 case PreAccepted:
                     return 
Command.SerializerSupport.preaccepted(attributes(saveStatus), executeAt, 
Ballot.ZERO);
-                case Accepted:
                 case AcceptedInvalidate:
+                    return 
Command.AcceptedInvalidateWithoutDefinition.acceptedInvalidate(attributes(saveStatus),
 promised, Ballot.ZERO);
+
+                case Accepted:
                 case AcceptedWithDefinition:
                 case AcceptedInvalidateWithDefinition:
                 case PreCommittedWithDefinition:


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org