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=4fbb49a61d3f23888c99e2d4f258a8601c8dc091;hb=refs%2Fchanges%2F78%2F100478%2F3;hp=7cdc04aba17b471ea218e3e8060141b9a8a2451e;hpb=c7078128d6f35eebee2f98108ff929dcccfc322d;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 7cdc04aba1..4fbb49a61d 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 @@ -14,9 +14,13 @@ 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; /** @@ -55,28 +59,57 @@ 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.empty()))); } public void delete(final YangInstanceIdentifier path) { - ensureTransactionProxy(path).delete(path); + if (path.isEmpty()) { + ensureAllProxies().forEach(proxy -> proxy.delete(YangInstanceIdentifier.empty())); + } 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.empty(), 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.empty(), scattered.container())); + } + + private AbstractProxyTransaction ensureProxy(final PathArgument childId) { + return ensureProxy(YangInstanceIdentifier.create(childId)); } public DOMStoreThreePhaseCommitCohort ready() {