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 4fb7025dd32f1e743cf19311356a67e6613a3db4 Author: Benedict Elliott Smith <bened...@apache.org> AuthorDate: Wed Sep 25 19:15:48 2024 +0100 wip: journal replay finishing touches --- accord-core/src/main/java/accord/api/DataStore.java | 1 - accord-core/src/main/java/accord/impl/InMemoryCommandStore.java | 1 + accord-core/src/main/java/accord/topology/Topologies.java | 1 - accord-core/src/test/java/accord/impl/basic/Cluster.java | 2 ++ .../src/test/java/accord/impl/list/ListFetchCoordinator.java | 2 +- accord-core/src/test/java/accord/impl/list/ListStore.java | 7 ------- 6 files changed, 4 insertions(+), 10 deletions(-) diff --git a/accord-core/src/main/java/accord/api/DataStore.java b/accord-core/src/main/java/accord/api/DataStore.java index 45d62101..e0d013d8 100644 --- a/accord-core/src/main/java/accord/api/DataStore.java +++ b/accord-core/src/main/java/accord/api/DataStore.java @@ -114,5 +114,4 @@ public interface DataStore FetchResult fetch(Node node, SafeCommandStore safeStore, Ranges ranges, SyncPoint syncPoint, FetchRanges callback); AsyncResult<Void> snapshot(Ranges ranges, TxnId before); - default void restoreFromSnapshot() {}; } diff --git a/accord-core/src/main/java/accord/impl/InMemoryCommandStore.java b/accord-core/src/main/java/accord/impl/InMemoryCommandStore.java index 2793b6e9..6ba93447 100644 --- a/accord-core/src/main/java/accord/impl/InMemoryCommandStore.java +++ b/accord-core/src/main/java/accord/impl/InMemoryCommandStore.java @@ -1323,6 +1323,7 @@ public abstract class InMemoryCommandStore extends CommandStore commandsForKey.clear(); rangeCommands.clear(); historicalRangeCommands.clear(); + unsafeSetRejectBefore(new ReducingRangeMap<>()); } public interface Loader diff --git a/accord-core/src/main/java/accord/topology/Topologies.java b/accord-core/src/main/java/accord/topology/Topologies.java index 91a0d7ce..2d4a3494 100644 --- a/accord-core/src/main/java/accord/topology/Topologies.java +++ b/accord-core/src/main/java/accord/topology/Topologies.java @@ -27,7 +27,6 @@ import java.util.List; import java.util.Set; import com.google.common.collect.Iterators; -import com.google.common.collect.Sets; import accord.api.TopologySorter; import accord.local.Node; diff --git a/accord-core/src/test/java/accord/impl/basic/Cluster.java b/accord-core/src/test/java/accord/impl/basic/Cluster.java index a938052e..8aa3817d 100644 --- a/accord-core/src/test/java/accord/impl/basic/Cluster.java +++ b/accord-core/src/test/java/accord/impl/basic/Cluster.java @@ -67,6 +67,7 @@ import accord.impl.CoordinateDurabilityScheduling; import accord.impl.DefaultLocalListeners; import accord.impl.DefaultRemoteListeners; import accord.impl.DefaultRequestTimeouts; +import accord.impl.InMemoryCommandStore; import accord.impl.InMemoryCommandStore.GlobalCommand; import accord.impl.MessageListener; import accord.impl.PrefixedIntHashKey; @@ -103,6 +104,7 @@ import accord.topology.TopologyRandomizer; import accord.utils.Gens; import accord.utils.Invariants; import accord.utils.RandomSource; +import accord.utils.ReducingRangeMap; import accord.utils.async.AsyncChains; import accord.utils.async.AsyncResult; diff --git a/accord-core/src/test/java/accord/impl/list/ListFetchCoordinator.java b/accord-core/src/test/java/accord/impl/list/ListFetchCoordinator.java index a4687514..c7ffc2c6 100644 --- a/accord-core/src/test/java/accord/impl/list/ListFetchCoordinator.java +++ b/accord-core/src/test/java/accord/impl/list/ListFetchCoordinator.java @@ -65,7 +65,7 @@ public class ListFetchCoordinator extends AbstractFetchCoordinator ListData listData = (ListData) data; persisting.add(commandStore.execute(PreLoadContext.empty(), safeStore -> { listData.forEach((key, value) -> listStore.data.merge(key, value, Timestamped::merge)); - }).addCallback((ignore, fail) -> { + }).flatMap(ignore -> listStore.snapshot(received, syncPoint.syncId)).addCallback((success, fail) -> { if (fail == null) success(from, received); else fail(from, received, fail); }).beginAsResult()); diff --git a/accord-core/src/test/java/accord/impl/list/ListStore.java b/accord-core/src/test/java/accord/impl/list/ListStore.java index 2473d6dc..71aecfde 100644 --- a/accord-core/src/test/java/accord/impl/list/ListStore.java +++ b/accord-core/src/test/java/accord/impl/list/ListStore.java @@ -41,13 +41,8 @@ import accord.coordinate.Timeout; import accord.coordinate.TopologyMismatch; import accord.coordinate.tracking.AllTracker; import accord.coordinate.tracking.RequestStatus; -import accord.impl.InMemoryCommandStore; import accord.impl.basic.SimulatedFault; -import accord.local.CommandStore; -import accord.local.CommandStores.RangesForEpoch; -import accord.local.DurableBefore; import accord.local.Node; -import accord.local.RedundantBefore; import accord.local.SafeCommandStore; import accord.messages.Callback; import accord.messages.ReadData; @@ -64,7 +59,6 @@ import accord.topology.Topologies; import accord.topology.Topology; import accord.utils.Invariants; import accord.utils.RandomSource; -import accord.utils.ReducingRangeMap; import accord.utils.Timestamped; import accord.utils.async.AsyncChain; import accord.utils.async.AsyncChains; @@ -242,7 +236,6 @@ public class ListStore implements DataStore purgedAts.addAll(snapshot.purgedAts); fetchCompletes.addAll(snapshot.fetchCompletes); pendingRemoves.addAll(snapshot.pendingRemoves); - InMemoryCommandStore commandStore = (InMemoryCommandStore) CommandStore.current(); } public void clear() --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org