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%2FLocalFrontendHistory.java;h=3125ed651a5c6cbe64a511e83a2348beb4b3cb14;hp=17e861a3e7252a9c269801bc00a2ebe9ec31d66b;hb=3402cfce32b05957219e54754dd7ca5b0a54cd0e;hpb=12fcdfe39aa26dcba7fd3bb4d4c68e3d02e65c51 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalFrontendHistory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalFrontendHistory.java index 17e861a3e7..3125ed651a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalFrontendHistory.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalFrontendHistory.java @@ -7,10 +7,9 @@ */ package org.opendaylight.controller.cluster.datastore; -import com.google.common.base.Preconditions; +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; @@ -18,9 +17,9 @@ import java.util.Optional; import java.util.SortedSet; 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; - /** * Chained transaction specialization of {@link AbstractFrontendHistory}. It prevents concurrent open transactions. * @@ -31,21 +30,21 @@ final class LocalFrontendHistory extends AbstractFrontendHistory { private LocalFrontendHistory(final String persistenceId, final ShardDataTree tree, final ShardDataTreeTransactionChain chain, final Map closedTransactions, - final RangeSet purgedTransactions) { + final MutableUnsignedLongSet purgedTransactions) { super(persistenceId, tree, closedTransactions, purgedTransactions); - this.chain = Preconditions.checkNotNull(chain); + this.chain = requireNonNull(chain); } static LocalFrontendHistory create(final String persistenceId, final ShardDataTree tree, final ShardDataTreeTransactionChain chain) { - return new LocalFrontendHistory(persistenceId, tree, chain, ImmutableMap.of(), TreeRangeSet.create()); + return new LocalFrontendHistory(persistenceId, tree, chain, ImmutableMap.of(), MutableUnsignedLongSet.of()); } static LocalFrontendHistory recreate(final String persistenceId, final ShardDataTree tree, final ShardDataTreeTransactionChain chain, final Map closedTransactions, - final RangeSet purgedTransactions) { + final MutableUnsignedLongSet purgedTransactions) { return new LocalFrontendHistory(persistenceId, tree, chain, new HashMap<>(closedTransactions), - TreeRangeSet.create(purgedTransactions)); + purgedTransactions.mutableCopy()); } @Override