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%2Futils%2FPruningDataTreeModification.java;h=afa17aeac6079eda4c7b688d5c20153e73d8c60b;hb=HEAD;hp=d0699fbcbaf807cd8ce4f421b692cebbd3a77997;hpb=20a32e6459fd1e27e7669bf1ebc7742b96787b94;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/PruningDataTreeModification.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/PruningDataTreeModification.java index d0699fbcba..afa17aeac6 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/PruningDataTreeModification.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/PruningDataTreeModification.java @@ -5,25 +5,25 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.controller.cluster.datastore.utils; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import com.google.common.collect.ForwardingObject; import java.io.IOException; import java.util.Optional; -import org.opendaylight.controller.cluster.datastore.node.utils.transformer.NormalizedNodePruner; +import org.opendaylight.controller.cluster.datastore.node.utils.transformer.ReusableNormalizedNodePruner; import org.opendaylight.controller.cluster.datastore.util.AbstractDataTreeModificationCursor; 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.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModificationCursor; -import org.opendaylight.yangtools.yang.data.impl.schema.tree.SchemaValidationFailedException; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.data.tree.api.DataTree; +import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification; +import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModificationCursor; +import org.opendaylight.yangtools.yang.data.tree.api.SchemaValidationFailedException; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,87 +31,131 @@ import org.slf4j.LoggerFactory; * The PruningDataTreeModification first removes all entries from the data which do not belong in the schemaContext * before delegating it to the actual DataTreeModification. */ -public class PruningDataTreeModification extends ForwardingObject implements DataTreeModification { +public abstract class PruningDataTreeModification extends ForwardingObject implements DataTreeModification { + /** + * A PruningDataTreeModification which always performs pruning before attempting an operation. This sacrifices + * performance to ensure all data has passed through the pruner -- such that data adaptations are performed. + */ + public static final class Proactive extends PruningDataTreeModification { + public Proactive(final DataTreeModification delegate, final DataTree dataTree, + final ReusableNormalizedNodePruner pruner) { + super(delegate, dataTree, pruner); + } - private static final Logger LOG = LoggerFactory.getLogger(PruningDataTreeModification.class); - private DataTreeModification delegate; - private final SchemaContext schemaContext; - private final DataTree dataTree; + @Override + public void merge(final YangInstanceIdentifier path, final NormalizedNode data) { + pruneAndMergeNode(path, data); + } - public PruningDataTreeModification(final DataTreeModification delegate, final DataTree dataTree, - final SchemaContext schemaContext) { - this.delegate = Preconditions.checkNotNull(delegate); - this.dataTree = Preconditions.checkNotNull(dataTree); - this.schemaContext = Preconditions.checkNotNull(schemaContext); - } + @Override + public void write(final YangInstanceIdentifier path, final NormalizedNode data) { + pruneAndWriteNode(path, data); + } - @Override - public DataTreeModification delegate() { - return delegate; + @Override + PruningDataTreeModification createNew(final DataTreeModification delegate, final DataTree dataTree, + final ReusableNormalizedNodePruner pruner) { + return new Proactive(delegate, dataTree, pruner); + } } - @Override - public void delete(final YangInstanceIdentifier yangInstanceIdentifier) { - try { - delegate.delete(yangInstanceIdentifier); - } catch (SchemaValidationFailedException e) { - LOG.warn("Node at path : {} does not exist ignoring delete", yangInstanceIdentifier); + /** + * A PruningDataTreeModification which performs pruning only when an operation results in an + * {@link SchemaValidationFailedException}. This offers superior performance in the normal case of not needing + * pruning. + */ + public static final class Reactive extends PruningDataTreeModification { + public Reactive(final DataTreeModification delegate, final DataTree dataTree, + final ReusableNormalizedNodePruner pruner) { + super(delegate, dataTree, pruner); } - } - @Override - public void merge(final YangInstanceIdentifier yangInstanceIdentifier, final NormalizedNode normalizedNode) { - try { - if (YangInstanceIdentifier.EMPTY.equals(yangInstanceIdentifier)) { - pruneAndMergeNode(yangInstanceIdentifier, normalizedNode); - } else { - delegate.merge(yangInstanceIdentifier, normalizedNode); + @Override + public void merge(final YangInstanceIdentifier path, final NormalizedNode data) { + if (path.isEmpty()) { + pruneAndMergeNode(path, data); + return; } - } catch (SchemaValidationFailedException e) { - LOG.warn("Node at path {} was pruned during merge due to validation error: {}", - yangInstanceIdentifier, e.getMessage()); - pruneAndMergeNode(yangInstanceIdentifier, normalizedNode); + try { + delegate().merge(path, data); + } catch (SchemaValidationFailedException e) { + LOG.warn("Node at path {} was pruned during merge due to validation error: {}", path, e.getMessage()); + pruneAndMergeNode(path, data); + } } - } + @Override + public void write(final YangInstanceIdentifier path, final NormalizedNode data) { + if (path.isEmpty()) { + pruneAndWriteNode(path, data); + return; + } - private void pruneAndMergeNode(final YangInstanceIdentifier yangInstanceIdentifier, - final NormalizedNode normalizedNode) { - NormalizedNode pruned = pruneNormalizedNode(yangInstanceIdentifier, normalizedNode); + try { + delegate().write(path, data); + } catch (SchemaValidationFailedException e) { + LOG.warn("Node at path : {} was pruned during write due to validation error: {}", path, e.getMessage()); + pruneAndWriteNode(path, data); + } + } - if (pruned != null) { - delegate.merge(yangInstanceIdentifier, pruned); + @Override + PruningDataTreeModification createNew(final DataTreeModification delegate, final DataTree dataTree, + final ReusableNormalizedNodePruner pruner) { + return new Reactive(delegate, dataTree, pruner); } } + private static final Logger LOG = LoggerFactory.getLogger(PruningDataTreeModification.class); + + private final ReusableNormalizedNodePruner pruner; + private final DataTree dataTree; + + private DataTreeModification delegate; + + PruningDataTreeModification(final DataTreeModification delegate, final DataTree dataTree, + final ReusableNormalizedNodePruner pruner) { + this.delegate = requireNonNull(delegate); + this.dataTree = requireNonNull(dataTree); + this.pruner = requireNonNull(pruner); + } + + @Override + protected final DataTreeModification delegate() { + return delegate; + } + + @Override + public final EffectiveModelContext modelContext() { + return delegate.modelContext(); + } + @Override - public void write(final YangInstanceIdentifier yangInstanceIdentifier, final NormalizedNode normalizedNode) { + public final void delete(final YangInstanceIdentifier path) { try { - if (YangInstanceIdentifier.EMPTY.equals(yangInstanceIdentifier)) { - pruneAndWriteNode(yangInstanceIdentifier, normalizedNode); - } else { - delegate.write(yangInstanceIdentifier, normalizedNode); - } + delegate.delete(path); } catch (SchemaValidationFailedException e) { - LOG.warn("Node at path : {} was pruned during write due to validation error: {}", - yangInstanceIdentifier, e.getMessage()); - - pruneAndWriteNode(yangInstanceIdentifier, normalizedNode); + LOG.warn("Node at path : {} does not exist ignoring delete", path); } } - private void pruneAndWriteNode(final YangInstanceIdentifier yangInstanceIdentifier, - final NormalizedNode normalizedNode) { - NormalizedNode pruned = pruneNormalizedNode(yangInstanceIdentifier, normalizedNode); + final void pruneAndMergeNode(final YangInstanceIdentifier path, final NormalizedNode data) { + final NormalizedNode pruned = pruneNormalizedNode(path, data); + if (pruned != null) { + delegate.merge(path, pruned); + } + } + final void pruneAndWriteNode(final YangInstanceIdentifier path, final NormalizedNode data) { + final NormalizedNode pruned = pruneNormalizedNode(path, data); if (pruned != null) { - delegate.write(yangInstanceIdentifier, pruned); + delegate.write(path, pruned); } } @Override - public void ready() { + public final void ready() { try { delegate.ready(); } catch (SchemaValidationFailedException e) { @@ -124,33 +168,37 @@ public class PruningDataTreeModification extends ForwardingObject implements Dat } @Override - public void applyToCursor(final DataTreeModificationCursor dataTreeModificationCursor) { + public final void applyToCursor(final DataTreeModificationCursor dataTreeModificationCursor) { delegate.applyToCursor(dataTreeModificationCursor); } @Override - public Optional> readNode(final YangInstanceIdentifier yangInstanceIdentifier) { + public final Optional readNode(final YangInstanceIdentifier yangInstanceIdentifier) { return delegate.readNode(yangInstanceIdentifier); } @Override - public DataTreeModification newModification() { - return new PruningDataTreeModification(delegate.newModification(), dataTree, schemaContext); + public final DataTreeModification newModification() { + return createNew(delegate.newModification(), dataTree, pruner.duplicate()); } @VisibleForTesting - NormalizedNode pruneNormalizedNode(final YangInstanceIdentifier path, final NormalizedNode input) { - NormalizedNodePruner pruner = new NormalizedNodePruner(path, schemaContext); + final NormalizedNode pruneNormalizedNode(final YangInstanceIdentifier path, final NormalizedNode input) { + pruner.initializeForPath(path); try { NormalizedNodeWriter.forStreamWriter(pruner).write(input); } catch (IOException ioe) { LOG.error("Unexpected IOException when pruning normalizedNode", ioe); + return null; } - return pruner.normalizedNode(); + return pruner.getResult().orElse(null); } - private static class PruningDataTreeModificationCursor extends AbstractDataTreeModificationCursor { + abstract PruningDataTreeModification createNew(DataTreeModification delegate, DataTree dataTree, + ReusableNormalizedNodePruner pruner); + + private static final class PruningDataTreeModificationCursor extends AbstractDataTreeModificationCursor { private final DataTreeModification toModification; private final PruningDataTreeModification pruningModification; @@ -161,18 +209,18 @@ public class PruningDataTreeModification extends ForwardingObject implements Dat } @Override - public void write(final PathArgument child, final NormalizedNode data) { - YangInstanceIdentifier path = current().node(child); - NormalizedNode prunedNode = pruningModification.pruneNormalizedNode(path, data); + public void write(final PathArgument child, final NormalizedNode data) { + final YangInstanceIdentifier path = current().node(child); + final NormalizedNode prunedNode = pruningModification.pruneNormalizedNode(path, data); if (prunedNode != null) { toModification.write(path, prunedNode); } } @Override - public void merge(final PathArgument child, final NormalizedNode data) { - YangInstanceIdentifier path = current().node(child); - NormalizedNode prunedNode = pruningModification.pruneNormalizedNode(path, data); + public void merge(final PathArgument child, final NormalizedNode data) { + final YangInstanceIdentifier path = current().node(child); + final NormalizedNode prunedNode = pruningModification.pruneNormalizedNode(path, data); if (prunedNode != null) { toModification.merge(path, prunedNode); }