[cassandra] branch cep-15-accord updated: Refactor response tracking to improve efficiency and clarity; introduce dedicated property tests; re-activate fast-path during range movements

[be...@apache.org]

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

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


The following commit(s) were added to refs/heads/cep-15-accord by this push:
     new 822bff2c72 Refactor response tracking to improve efficiency and clarity; introduce dedicated property tests; re-activate fast-path during range movements
822bff2c72 is described below

commit 822bff2c72791e654e315607b587a14d86bc4741
Author: Benedict Elliott Smith <be...@apache.org>
AuthorDate: Mon Nov 28 16:07:26 2022 +0000

    Refactor response tracking to improve efficiency and clarity; introduce dedicated property tests; re-activate fast-path during range movements
    
    patch by Benedict; reviewed by Ariel Weisberg for CASSANDRA-18056
---
 src/java/org/apache/cassandra/service/accord/AccordService.java    | 2 ++
 .../service/accord/serializers/BeginInvalidationSerializers.java   | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/java/org/apache/cassandra/service/accord/AccordService.java b/src/java/org/apache/cassandra/service/accord/AccordService.java
index 02c62510b6..1400d6e2f1 100644
--- a/src/java/org/apache/cassandra/service/accord/AccordService.java
+++ b/src/java/org/apache/cassandra/service/accord/AccordService.java
@@ -26,6 +26,7 @@ import java.util.concurrent.TimeoutException;
 import com.google.common.annotations.VisibleForTesting;
 
 import accord.impl.SimpleProgressLog;
+import accord.impl.SizeOfIntersectionSorter;
 import accord.local.Node;
 import accord.messages.Reply;
 import accord.messages.Request;
@@ -75,6 +76,7 @@ public class AccordService implements Shutdownable
                              new AccordAgent(),
                              new Random(),
                              scheduler,
+                             SizeOfIntersectionSorter.SUPPLIER,
                              SimpleProgressLog::new,
                              AccordCommandStores::new);
         this.nodeShutdown = toShutdownable(node);
diff --git a/src/java/org/apache/cassandra/service/accord/serializers/BeginInvalidationSerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/BeginInvalidationSerializers.java
index 9596761f35..d4ebe727f9 100644
--- a/src/java/org/apache/cassandra/service/accord/serializers/BeginInvalidationSerializers.java
+++ b/src/java/org/apache/cassandra/service/accord/serializers/BeginInvalidationSerializers.java
@@ -21,6 +21,7 @@ package org.apache.cassandra.service.accord.serializers;
 import java.io.IOException;
 
 import accord.api.RoutingKey;
+import accord.local.SaveStatus;
 import accord.local.Status;
 import accord.messages.BeginInvalidation;
 import accord.messages.BeginInvalidation.InvalidateNack;
@@ -70,14 +71,14 @@ public class BeginInvalidationSerializers
     {
         void serializeOk(InvalidateOk ok, DataOutputPlus out, int version) throws IOException
         {
-            CommandSerializers.status.serialize(ok.status, out, version);
+            CommandSerializers.saveStatus.serialize(ok.status, out, version);
             serializeNullable(KeySerializers.abstractRoute, ok.route, out, version);
             serializeNullable(KeySerializers.routingKey, ok.homeKey, out, version);
         }
 
         InvalidateOk deserializeOk(DataInputPlus in, int version) throws IOException
         {
-            Status status = CommandSerializers.status.deserialize(in, version);
+            SaveStatus status = CommandSerializers.saveStatus.deserialize(in, version);
             AbstractRoute route = deserializeNullable(KeySerializers.abstractRoute, in, version);
             RoutingKey homeKey = deserializeNullable(KeySerializers.routingKey, in, version);
             return new InvalidateOk(status, route, homeKey);
@@ -85,7 +86,7 @@ public class BeginInvalidationSerializers
 
         long serializedOkSize(InvalidateOk ok, int version)
         {
-            return CommandSerializers.status.serializedSize(ok.status, version)
+            return CommandSerializers.saveStatus.serializedSize(ok.status, version)
                    + serializedSizeNullable(KeySerializers.abstractRoute, ok.route, version)
                    + serializedSizeNullable(KeySerializers.routingKey, ok.homeKey, version);
         }


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