X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FFrontendHistoryMetadataBuilder.java;h=eedabddf801a85baeca6738a828610b154c5e4f6;hb=178ebab612c3ddd338e759ca7e929c25c623b0b3;hp=d8d7bdda217b9dd2c1144b4acfd901b2435acd79;hpb=edd61d79da614388134b0e0a618010c91e9c91bd;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendHistoryMetadataBuilder.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendHistoryMetadataBuilder.java index d8d7bdda21..eedabddf80 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendHistoryMetadataBuilder.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendHistoryMetadataBuilder.java @@ -7,7 +7,16 @@ */ package org.opendaylight.controller.cluster.datastore; -import com.google.common.base.Preconditions; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + +import com.google.common.collect.Range; +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; +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; @@ -15,19 +24,25 @@ import org.opendaylight.controller.cluster.datastore.persisted.FrontendHistoryMe import org.opendaylight.yangtools.concepts.Builder; import org.opendaylight.yangtools.concepts.Identifiable; -final class FrontendHistoryMetadataBuilder implements Builder, Identifiable { +final class FrontendHistoryMetadataBuilder implements Builder, + Identifiable { + + private final Map closedTransactions; + private final RangeSet purgedTransactions; private final LocalHistoryIdentifier identifier; - private long nextTransaction; private boolean closed; FrontendHistoryMetadataBuilder(final LocalHistoryIdentifier identifier) { - this.identifier = Preconditions.checkNotNull(identifier); + this.identifier = requireNonNull(identifier); + this.purgedTransactions = TreeRangeSet.create(); + this.closedTransactions = new HashMap<>(2); } FrontendHistoryMetadataBuilder(final ClientIdentifier clientId, final FrontendHistoryMetadata meta) { identifier = new LocalHistoryIdentifier(clientId, meta.getHistoryId(), meta.getCookie()); - nextTransaction = meta.getNextTransaction(); + closedTransactions = new HashMap<>(meta.getClosedTransactions()); + purgedTransactions = TreeRangeSet.create(meta.getPurgedTransactions()); closed = meta.isClosed(); } @@ -38,14 +53,42 @@ final class FrontendHistoryMetadataBuilder implements Builder