X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FStandaloneFrontendHistory.java;h=0278c1d1e590fccf69498bdeacfe02bddeea7120;hp=4ac3f9c1ed324d8c629c1f774866cdd618da8c80;hb=e9efe27538adb5ae575f77fda90f147d46341801;hpb=127042ea7e148d9dc0282acc3780b4754ca69e12 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/StandaloneFrontendHistory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/StandaloneFrontendHistory.java index 4ac3f9c1ed..0278c1d1e5 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/StandaloneFrontendHistory.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/StandaloneFrontendHistory.java @@ -10,8 +10,6 @@ package org.opendaylight.controller.cluster.datastore; import static java.util.Objects.requireNonNull; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.RangeSet; -import com.google.common.collect.TreeRangeSet; import com.google.common.primitives.UnsignedLong; import java.util.HashMap; import java.util.Map; @@ -21,6 +19,7 @@ import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier; import org.opendaylight.controller.cluster.access.concepts.LocalHistoryIdentifier; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; +import org.opendaylight.controller.cluster.datastore.utils.MutableUnsignedLongSet; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; /** @@ -30,28 +29,28 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification * @author Robert Varga */ final class StandaloneFrontendHistory extends AbstractFrontendHistory { - private final LocalHistoryIdentifier identifier; - private final ShardDataTree tree; + private final @NonNull LocalHistoryIdentifier identifier; + private final @NonNull ShardDataTree tree; private StandaloneFrontendHistory(final String persistenceId, final ClientIdentifier clientId, final ShardDataTree tree, final Map closedTransactions, - final RangeSet purgedTransactions) { + final MutableUnsignedLongSet purgedTransactions) { super(persistenceId, tree, closedTransactions, purgedTransactions); - this.identifier = new LocalHistoryIdentifier(clientId, 0); + identifier = new LocalHistoryIdentifier(clientId, 0); this.tree = requireNonNull(tree); } static @NonNull StandaloneFrontendHistory create(final String persistenceId, final ClientIdentifier clientId, final ShardDataTree tree) { return new StandaloneFrontendHistory(persistenceId, clientId, tree, ImmutableMap.of(), - TreeRangeSet.create()); + MutableUnsignedLongSet.of()); } static @NonNull StandaloneFrontendHistory recreate(final String persistenceId, final ClientIdentifier clientId, final ShardDataTree tree, final Map closedTransactions, - final RangeSet purgedTransactions) { + final MutableUnsignedLongSet purgedTransactions) { return new StandaloneFrontendHistory(persistenceId, clientId, tree, new HashMap<>(closedTransactions), - purgedTransactions); + purgedTransactions.mutableCopy()); } @Override