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

aleksey 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 6196ff96ef Change MaxConflicts to use a BTree under the hood
6196ff96ef is described below

commit 6196ff96ef36c968bdd9af705d8dfdf06d1c83fe
Author: Aleksey Yeschenko <alek...@apache.org>
AuthorDate: Sat Sep 28 19:25:23 2024 +0100

    Change MaxConflicts to use a BTree under the hood
    
    patch by Aleksey Yeschenko; reviewed by Benedict Elliott Smith for
    CASSANDRA-19952
---
 modules/accord                                              |  2 +-
 .../apache/cassandra/service/accord/api/AccordAgent.java    | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/accord b/modules/accord
index 4844e64945..593e042535 160000
--- a/modules/accord
+++ b/modules/accord
@@ -1 +1 @@
-Subproject commit 4844e64945b720c802dce11d811e25665f9da826
+Subproject commit 593e042535d60e773cfa5f7c4b6a63e2fb6e5b30
diff --git a/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java 
b/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java
index 23a3520853..11d7dd01cf 100644
--- a/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java
+++ b/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java
@@ -161,6 +161,19 @@ public class AccordAgent implements Agent
         return 32;
     }
 
+    // TODO (expected): we probably want additional configuration here
+    @Override
+    public long maxConflictsHlcPruneDelta()
+    {
+        return SECONDS.toMicros(1);
+    }
+
+    @Override
+    public long maxConflictsPruneInterval()
+    {
+        return 100;
+    }
+
     /**
      * Create an empty transaction that Accord can use for its internal 
transactions. This is not suitable
      * for tests since it skips validation done by regular transactions.


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

Reply via email to