This is an automated email from the ASF dual-hosted git repository. ifesdjeen pushed a commit to branch CASSANDRA-19944-persistent-fields in repository https://gitbox.apache.org/repos/asf/cassandra-accord.git
commit cff185a92a97722a1b42866b3cf245f899b46b9f Author: Alex Petrov <oleksandr.pet...@gmail.com> AuthorDate: Thu Sep 26 20:16:35 2024 +0200 Simplify bootstrap --- .../java/accord/impl/InMemoryCommandStore.java | 36 ---------------------- .../src/main/java/accord/local/CommandStore.java | 11 +++++-- .../main/java/accord/local/SafeCommandStore.java | 4 +-- 3 files changed, 10 insertions(+), 41 deletions(-) diff --git a/accord-core/src/main/java/accord/impl/InMemoryCommandStore.java b/accord-core/src/main/java/accord/impl/InMemoryCommandStore.java index e66b25a9..1109f2a6 100644 --- a/accord-core/src/main/java/accord/impl/InMemoryCommandStore.java +++ b/accord-core/src/main/java/accord/impl/InMemoryCommandStore.java @@ -1468,40 +1468,4 @@ public abstract class InMemoryCommandStore extends CommandStore historicalRangeCommands.merge(txnId, ranges.slice(allRanges), Ranges::with); }); } - - @Override - public void unsafeSetRangesForEpoch(RangesForEpoch newRangesForEpoch) - { - super.unsafeSetRangesForEpoch(newRangesForEpoch); - } - - @Override - public void unsafeSetDurableBefore(DurableBefore newDurableBefore) - { - super.unsafeSetDurableBefore(newDurableBefore); - } - - @Override - public void unsafeSetRedundantBefore(RedundantBefore newRedundantBefore) - { - super.unsafeSetRedundantBefore(newRedundantBefore); - } - - @Override - public void unsafeSetRejectBefore(ReducingRangeMap<Timestamp> newRejectBefore) - { - super.unsafeSetRejectBefore(newRejectBefore); - } - - @Override - public void unsafeSetSafeToRead(NavigableMap<Timestamp, Ranges> newSafeToRead) - { - super.unsafeSetSafeToRead(newSafeToRead); - } - - @Override - public void unsafeSetBootstrapBeganAt(NavigableMap<TxnId, Ranges> newBootstrapBeganAt) - { - super.unsafeSetBootstrapBeganAt(newBootstrapBeganAt); - } } diff --git a/accord-core/src/main/java/accord/local/CommandStore.java b/accord-core/src/main/java/accord/local/CommandStore.java index 2ebe1c44..65d7cd5a 100644 --- a/accord-core/src/main/java/accord/local/CommandStore.java +++ b/accord-core/src/main/java/accord/local/CommandStore.java @@ -289,8 +289,14 @@ public abstract class CommandStore implements AgentExecutor this.safeToRead = newSafeToRead; } + public void upsertSetBootstrapBeganAt(TxnId globalSyncId, Ranges ranges) + { + unsafeSetBootstrapBeganAt(bootstrap(globalSyncId, ranges, bootstrapBeganAt)); + } + protected void unsafeSetBootstrapBeganAt(NavigableMap<TxnId, Ranges> newBootstrapBeganAt) { + this.bootstrapBeganAt = newBootstrapBeganAt; } @@ -518,7 +524,7 @@ public abstract class CommandStore implements AgentExecutor final void markBootstrapping(SafeCommandStore safeStore, TxnId globalSyncId, Ranges ranges) { - safeStore.upsertSetBootstrapBeganAt(bootstrap(globalSyncId, ranges, bootstrapBeganAt)); + safeStore.upsertSetBootstrapBeganAt(globalSyncId, ranges); RedundantBefore addRedundantBefore = RedundantBefore.create(ranges, Long.MIN_VALUE, Long.MAX_VALUE, TxnId.NONE, TxnId.NONE, TxnId.NONE, globalSyncId); safeStore.upsertRedundantBefore(addRedundantBefore); safeStore.upsertDurableBefore(DurableBefore.create(ranges, TxnId.NONE, TxnId.NONE)); @@ -576,7 +582,6 @@ public abstract class CommandStore implements AgentExecutor safeStore.upsertRedundantBefore(addRedundantBefore); // find which ranges need to bootstrap, subtracting those already in progress that cover the id - // safeStore.upsertUnsafeToRead(ranges); markUnsafeToRead(ranges); } @@ -795,7 +800,7 @@ public abstract class CommandStore implements AgentExecutor }); } - protected static ImmutableSortedMap<TxnId, Ranges> bootstrap(TxnId at, Ranges ranges, NavigableMap<TxnId, Ranges> bootstrappedAt) + public static ImmutableSortedMap<TxnId, Ranges> bootstrap(TxnId at, Ranges ranges, NavigableMap<TxnId, Ranges> bootstrappedAt) { Invariants.checkArgument(bootstrappedAt.lastKey().compareTo(at) < 0 || at == TxnId.NONE); if (at == TxnId.NONE) diff --git a/accord-core/src/main/java/accord/local/SafeCommandStore.java b/accord-core/src/main/java/accord/local/SafeCommandStore.java index 82ba1c06..58bf15f2 100644 --- a/accord-core/src/main/java/accord/local/SafeCommandStore.java +++ b/accord-core/src/main/java/accord/local/SafeCommandStore.java @@ -254,9 +254,9 @@ public abstract class SafeCommandStore commandStore().upsertRedundantBefore(addRedundantBefore); } - public void upsertSetBootstrapBeganAt(NavigableMap<TxnId, Ranges> newBootstrapBeganAt) + public void upsertSetBootstrapBeganAt(TxnId globalSyncId, Ranges ranges) { - commandStore().unsafeSetBootstrapBeganAt(newBootstrapBeganAt); + commandStore().upsertSetBootstrapBeganAt(globalSyncId, ranges); } public void upsertDurableBefore(DurableBefore addDurableBefore) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org