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%2Fdatabroker%2Factors%2Fdds%2FClientTransaction.java;h=b2ff5d5184d58753fa76bf90df457abfe6e685f0;hb=f40e99a51cd3fc2c9be3ac8aa0772bdb6b6ce479;hp=f5855c279a9e4e9f648b93a047c1d9cdc3c4a1cc;hpb=27e0cf91aaba3d2a9f9e3f33e31f0faece502cd4;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransaction.java index f5855c279a..b2ff5d5184 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransaction.java @@ -12,10 +12,15 @@ import static com.google.common.base.Preconditions.checkState; import com.google.common.annotations.Beta; import com.google.common.util.concurrent.FluentFuture; import java.util.Collection; +import java.util.Map; import java.util.Optional; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; +import org.opendaylight.controller.cluster.datastore.utils.RootScatterGather; import org.opendaylight.mdsal.dom.spi.store.DOMStoreThreePhaseCommitCohort; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; +import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; /** @@ -54,49 +59,76 @@ public class ClientTransaction extends AbstractClientHandle exists(final YangInstanceIdentifier path) { - return ensureTransactionProxy(path).exists(path); + return ensureProxy(path).exists(path); } public FluentFuture> read(final YangInstanceIdentifier path) { - return ensureTransactionProxy(path).read(path); + return path.isEmpty() ? readRoot() : ensureProxy(path).read(path); + } + + private FluentFuture> readRoot() { + return RootScatterGather.gather(parent().actorUtils(), ensureAllProxies() + .map(proxy -> proxy.read(YangInstanceIdentifier.of()))); } public void delete(final YangInstanceIdentifier path) { - ensureTransactionProxy(path).delete(path); + if (path.isEmpty()) { + ensureAllProxies().forEach(proxy -> proxy.delete(YangInstanceIdentifier.of())); + } else { + ensureProxy(path).delete(path); + } } public void merge(final YangInstanceIdentifier path, final NormalizedNode data) { - ensureTransactionProxy(path).merge(path, data); + if (path.isEmpty()) { + mergeRoot(RootScatterGather.castRootNode(data)); + } else { + ensureProxy(path).merge(path, data); + } + } + + private void mergeRoot(final @NonNull ContainerNode rootData) { + if (!rootData.isEmpty()) { + RootScatterGather.scatterTouched(rootData, this::ensureProxy).forEach( + scattered -> scattered.shard().merge(YangInstanceIdentifier.of(), scattered.container())); + } } public void write(final YangInstanceIdentifier path, final NormalizedNode data) { - ensureTransactionProxy(path).write(path, data); + if (path.isEmpty()) { + writeRoot(RootScatterGather.castRootNode(data)); + } else { + ensureProxy(path).write(path, data); + } + } + + private void writeRoot(final @NonNull ContainerNode rootData) { + RootScatterGather.scatterAll(rootData, this::ensureProxy, ensureAllProxies()).forEach( + scattered -> scattered.shard().write(YangInstanceIdentifier.of(), scattered.container())); + } + + private AbstractProxyTransaction ensureProxy(final PathArgument childId) { + return ensureProxy(YangInstanceIdentifier.of(childId)); } public DOMStoreThreePhaseCommitCohort ready() { - final Collection toReady = ensureClosed(); - checkState(toReady != null, "Attempted to submit a closed transaction %s", this); + final Map participants = ensureClosed(); + checkState(participants != null, "Attempted to submit a closed transaction %s", this); + final Collection toReady = participants.values(); toReady.forEach(AbstractProxyTransaction::seal); - final AbstractTransactionCommitCohort cohort; - switch (toReady.size()) { - case 0: - cohort = new EmptyTransactionCommitCohort(parent(), getIdentifier()); - break; - case 1: - cohort = new DirectTransactionCommitCohort(parent(), getIdentifier(), toReady.iterator().next()); - break; - default: - cohort = new ClientTransactionCommitCohort(parent(), getIdentifier(), toReady); - break; - } - return parent().onTransactionReady(this, cohort); + final TransactionIdentifier txId = getIdentifier(); + final AbstractClientHistory parent = parent(); + parent.onTransactionShardsBound(txId, participants.keySet()); + + final AbstractTransactionCommitCohort cohort = switch (toReady.size()) { + case 0 -> new EmptyTransactionCommitCohort(parent, txId); + case 1 -> new DirectTransactionCommitCohort(parent, txId, toReady.iterator().next()); + default -> new ClientTransactionCommitCohort(parent, txId, toReady); + }; + return parent.onTransactionReady(this, cohort); } @Override