X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-data-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fimpl%2Fschema%2Ftree%2FInMemoryDataTreeModification.java;h=4abee0dfb63e53b85bbdb1e064d73959fe390869;hb=8ff4d271df0d1e2f7d00cffee6958427dc1d4da5;hp=73d3ac36c03980d86d3235764755ea924ad38a10;hpb=0eb60011b52e4e56c62b47a36eb334f2c3b3ad6a;p=yangtools.git diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeModification.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeModification.java index 73d3ac36c0..4abee0dfb6 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeModification.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeModification.java @@ -7,10 +7,10 @@ */ package org.opendaylight.yangtools.yang.data.impl.schema.tree; +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; import java.util.Map.Entry; - -import javax.annotation.concurrent.GuardedBy; - +import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; 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; @@ -18,26 +18,38 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType; import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; +import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; - final class InMemoryDataTreeModification implements DataTreeModification { + private static final AtomicIntegerFieldUpdater UPDATER = + AtomicIntegerFieldUpdater.newUpdater(InMemoryDataTreeModification.class, "sealed"); private static final Logger LOG = LoggerFactory.getLogger(InMemoryDataTreeModification.class); + private final RootModificationApplyOperation strategyTree; private final InMemoryDataTreeSnapshot snapshot; private final ModifiedNode rootNode; + private final Version version; - @GuardedBy("this") - private boolean sealed = false; + private volatile int sealed = 0; InMemoryDataTreeModification(final InMemoryDataTreeSnapshot snapshot, final RootModificationApplyOperation resolver) { this.snapshot = Preconditions.checkNotNull(snapshot); this.strategyTree = Preconditions.checkNotNull(resolver).snapshot(); - this.rootNode = ModifiedNode.createUnmodified(snapshot.getRootNode()); + this.rootNode = ModifiedNode.createUnmodified(snapshot.getRootNode(), false); + + /* + * We could allocate version beforehand, since Version contract + * states two allocated version must be always different. + * + * Preallocating version simplifies scenarios such as + * chaining of modifications, since version for particular + * node in modification and in data tree (if successfully + * committed) will be same and will not change. + */ + this.version = snapshot.getRootNode().getSubtreeVersion().next(); } ModifiedNode getRootModification() { @@ -49,20 +61,21 @@ final class InMemoryDataTreeModification implements DataTreeModification { } @Override - public synchronized void write(final YangInstanceIdentifier path, final NormalizedNode value) { + public void write(final YangInstanceIdentifier path, final NormalizedNode data) { checkSealed(); - resolveModificationFor(path).write(value); + + resolveModificationFor(path).write(data); } @Override - public synchronized void merge(final YangInstanceIdentifier path, final NormalizedNode data) { + public void merge(final YangInstanceIdentifier path, final NormalizedNode data) { checkSealed(); + mergeImpl(resolveModificationFor(path),data); } private void mergeImpl(final OperationWithModification op,final NormalizedNode data) { - - if(data instanceof NormalizedNodeContainer) { + if (data instanceof NormalizedNodeContainer) { @SuppressWarnings({ "rawtypes", "unchecked" }) NormalizedNodeContainer> dataContainer = (NormalizedNodeContainer) data; for(NormalizedNode child : dataContainer.getValue()) { @@ -74,13 +87,14 @@ final class InMemoryDataTreeModification implements DataTreeModification { } @Override - public synchronized void delete(final YangInstanceIdentifier path) { + public void delete(final YangInstanceIdentifier path) { checkSealed(); + resolveModificationFor(path).delete(); } @Override - public synchronized Optional> readNode(final YangInstanceIdentifier path) { + public Optional> readNode(final YangInstanceIdentifier path) { /* * Walk the tree from the top, looking for the first node between root and * the requested path which has been modified. If no such node exists, @@ -102,22 +116,22 @@ final class InMemoryDataTreeModification implements DataTreeModification { private Optional resolveSnapshot(final YangInstanceIdentifier path, final ModifiedNode modification) { final Optional> potentialSnapshot = modification.getSnapshotCache(); - if(potentialSnapshot.isPresent()) { + if (potentialSnapshot.isPresent()) { return potentialSnapshot.get(); } try { return resolveModificationStrategy(path).apply(modification, modification.getOriginal(), - snapshot.getRootNode().getSubtreeVersion().next()); + version); } catch (Exception e) { - LOG.error("Could not create snapshot for {}:{}", path,modification,e); + LOG.error("Could not create snapshot for {}:{}", path, modification, e); throw e; } } private ModificationApplyOperation resolveModificationStrategy(final YangInstanceIdentifier path) { LOG.trace("Resolving modification apply strategy for {}", path); - if(rootNode.getType() == ModificationType.UNMODIFIED) { + if (rootNode.getType() == ModificationType.UNMODIFIED) { strategyTree.upgradeIfPossible(); } @@ -125,25 +139,33 @@ final class InMemoryDataTreeModification implements DataTreeModification { } private OperationWithModification resolveModificationFor(final YangInstanceIdentifier path) { - ModifiedNode modification = rootNode; // We ensure strategy is present. - ModificationApplyOperation operation = resolveModificationStrategy(path); + final ModificationApplyOperation operation = resolveModificationStrategy(path); + + final boolean isOrdered; + if (operation instanceof SchemaAwareApplyOperation) { + isOrdered = ((SchemaAwareApplyOperation) operation).isOrdered(); + } else { + isOrdered = true; + } + + ModifiedNode modification = rootNode; for (PathArgument pathArg : path.getPathArguments()) { - modification = modification.modifyChild(pathArg); + modification = modification.modifyChild(pathArg, isOrdered); } return OperationWithModification.from(operation, modification); } @Override - public synchronized void ready() { - Preconditions.checkState(!sealed, "Attempted to seal an already-sealed Data Tree."); - sealed = true; + public void ready() { + final boolean wasRunning = UPDATER.compareAndSet(this, 0, 1); + Preconditions.checkState(wasRunning, "Attempted to seal an already-sealed Data Tree."); + rootNode.seal(); } - @GuardedBy("this") private void checkSealed() { - Preconditions.checkState(!sealed, "Data Tree is sealed. No further modifications allowed."); + Preconditions.checkState(sealed == 0, "Data Tree is sealed. No further modifications allowed."); } @Override @@ -152,30 +174,26 @@ final class InMemoryDataTreeModification implements DataTreeModification { } @Override - public synchronized DataTreeModification newModification() { - Preconditions.checkState(sealed, "Attempted to chain on an unsealed modification"); + public DataTreeModification newModification() { + Preconditions.checkState(sealed == 1, "Attempted to chain on an unsealed modification"); - if(rootNode.getType() == ModificationType.UNMODIFIED) { + if (rootNode.getType() == ModificationType.UNMODIFIED) { + // Simple fast case: just use the underlying modification return snapshot.newModification(); } /* - * FIXME: Add advanced transaction chaining for modification of not rebased - * modification. - * - * Current computation of tempRoot may yeld incorrect subtree versions - * if there are multiple concurrent transactions, which may break - * versioning preconditions for modification of previously occured write, - * directly nested under parent node, since node version is derived from - * subtree version. - * - * For deeper nodes subtree version is derived from their respective metadata - * nodes, so this incorrect root subtree version is not affecting us. + * We will use preallocated version, this means returned snapshot will + * have same version each time this method is called. */ TreeNode originalSnapshotRoot = snapshot.getRootNode(); - Optional tempRoot = strategyTree.apply(rootNode, Optional.of(originalSnapshotRoot), originalSnapshotRoot.getSubtreeVersion().next()); + Optional tempRoot = strategyTree.apply(rootNode, Optional.of(originalSnapshotRoot), version); InMemoryDataTreeSnapshot tempTree = new InMemoryDataTreeSnapshot(snapshot.getSchemaContext(), tempRoot.get(), strategyTree); return tempTree.newModification(); } + + Version getVersion() { + return version; + } }