This is an automated email from the ASF dual-hosted git repository. ifesdjeen pushed a commit to branch ex-sp-pl in repository https://gitbox.apache.org/repos/asf/cassandra-accord.git
commit fbc941ca7a6041732174b9d8011a29e1e138d7e7 Author: Alex Petrov <[email protected]> AuthorDate: Sun Sep 29 18:25:29 2024 +0200 Fix build --- accord-core/src/main/java/accord/impl/InMemoryCommandStore.java | 7 ++----- accord-core/src/main/java/accord/local/cfk/CommandsForKey.java | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/accord-core/src/main/java/accord/impl/InMemoryCommandStore.java b/accord-core/src/main/java/accord/impl/InMemoryCommandStore.java index 11eaf5f9..b203575e 100644 --- a/accord-core/src/main/java/accord/impl/InMemoryCommandStore.java +++ b/accord-core/src/main/java/accord/impl/InMemoryCommandStore.java @@ -1404,7 +1404,7 @@ public abstract class InMemoryCommandStore extends CommandStore } else if (local.saveStatus().compareTo(Applying) >= 0 && !local.hasBeen(Truncated)) { - unsafeApplyWrites(safeStore, context, safeCommand, local); + unsafeApplyWrites(safeStore, safeCommand, local); } return null; }); @@ -1412,9 +1412,8 @@ public abstract class InMemoryCommandStore extends CommandStore }; } - public static void unsafeApplyWrites(SafeCommandStore safeStore, PreLoadContext context, SafeCommand safeCommand, Command command) + public static void unsafeApplyWrites(SafeCommandStore safeStore, SafeCommand safeCommand, Command command) { - CommandStore unsafeStore = safeStore.commandStore(); Command.Executed executed = command.asExecuted(); Participants<?> executes = executed.participants().executes(safeStore, command.txnId(), command.executeAt()); if (!executes.isEmpty()) @@ -1425,8 +1424,6 @@ public abstract class InMemoryCommandStore extends CommandStore } } - - @VisibleForTesting public void load(Deps loading) { diff --git a/accord-core/src/main/java/accord/local/cfk/CommandsForKey.java b/accord-core/src/main/java/accord/local/cfk/CommandsForKey.java index b1489ac0..95fe7950 100644 --- a/accord-core/src/main/java/accord/local/cfk/CommandsForKey.java +++ b/accord-core/src/main/java/accord/local/cfk/CommandsForKey.java @@ -775,7 +775,7 @@ public class CommandsForKey extends CommandsForKeyUpdate implements CommandsSumm return this == COMMITTED | this == STABLE | this == APPLIED; } - Timestamp depsKnownBefore(TxnId txnId, Timestamp executeAt) + public Timestamp depsKnownBefore(TxnId txnId, Timestamp executeAt) { return depsKnownUntilExecuteAt() ? executeAt : txnId; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
