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=eb6b9726bece91e6d9afa97af1d3037b21187117;hb=a10f89d551d5592577b8b573d571a9b0cf3f3ae2;hp=44397cc0ecfbbaed648ce6e1b87a9cf4e2aa2719;hpb=ece16db3db0f3599ee0ab92899ac42316414e032;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 44397cc0ec..eb6b9726be 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 @@ -9,33 +9,46 @@ package org.opendaylight.yangtools.yang.data.impl.schema.tree; import com.google.common.base.Optional; import com.google.common.base.Preconditions; -import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument; +import java.util.Map.Entry; +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; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer; +import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes; 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.StoreTreeNodes; import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; -import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeUtils; +import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.concurrent.GuardedBy; -import java.util.Map.Entry; - 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 ModificationApplyOperation strategyTree; + + 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 ModificationApplyOperation resolver) { + InMemoryDataTreeModification(final InMemoryDataTreeSnapshot snapshot, final RootModificationApplyOperation resolver) { this.snapshot = Preconditions.checkNotNull(snapshot); - this.strategyTree = Preconditions.checkNotNull(resolver); - this.rootNode = ModifiedNode.createUnmodified(snapshot.getRootNode()); + this.strategyTree = Preconditions.checkNotNull(resolver).snapshot(); + 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() { @@ -47,97 +60,98 @@ final class InMemoryDataTreeModification implements DataTreeModification { } @Override - public synchronized void write(final InstanceIdentifier 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 InstanceIdentifier 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) { - @SuppressWarnings({ "rawtypes", "unchecked" }) - NormalizedNodeContainer> dataContainer = (NormalizedNodeContainer) data; - for(NormalizedNode child : dataContainer.getValue()) { - PathArgument childId = child.getIdentifier(); - mergeImpl(op.forChild(childId), child); - } - } - op.merge(data); + resolveModificationFor(path).merge(data); } @Override - public synchronized void delete(final InstanceIdentifier path) { + public void delete(final YangInstanceIdentifier path) { checkSealed(); + resolveModificationFor(path).delete(); } @Override - public synchronized Optional> readNode(final InstanceIdentifier 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, * we use the node itself. */ - final Entry entry = TreeNodeUtils.findClosestsOrFirstMatch(rootNode, path, ModifiedNode.IS_TERMINAL_PREDICATE); - final InstanceIdentifier key = entry.getKey(); + final Entry entry = StoreTreeNodes.findClosestsOrFirstMatch(rootNode, path, ModifiedNode.IS_TERMINAL_PREDICATE); + final YangInstanceIdentifier key = entry.getKey(); final ModifiedNode mod = entry.getValue(); final Optional result = resolveSnapshot(key, mod); if (result.isPresent()) { NormalizedNode data = result.get().getData(); - return NormalizedNodeUtils.findNode(key, data, path); + return NormalizedNodes.findNode(key, data, path); } else { return Optional.absent(); } } - private Optional resolveSnapshot(final InstanceIdentifier path, - final ModifiedNode modification) { - final Optional> potentialSnapshot = modification.getSnapshotCache(); - if(potentialSnapshot.isPresent()) { - return potentialSnapshot.get(); + private Optional resolveSnapshot(final YangInstanceIdentifier path, final ModifiedNode modification) { + final Optional potentialSnapshot = modification.getSnapshot(); + if (potentialSnapshot != null) { + return potentialSnapshot; } 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 InstanceIdentifier path) { + private ModificationApplyOperation resolveModificationStrategy(final YangInstanceIdentifier path) { LOG.trace("Resolving modification apply strategy for {}", path); - return TreeNodeUtils.findNodeChecked(strategyTree, path); + if (rootNode.getOperation() == LogicalOperation.NONE) { + strategyTree.upgradeIfPossible(); + } + + return StoreTreeNodes.findNodeChecked(strategyTree, path); } - private OperationWithModification resolveModificationFor(final InstanceIdentifier path) { - ModifiedNode modification = rootNode; + private OperationWithModification resolveModificationFor(final YangInstanceIdentifier path) { // We ensure strategy is present. - ModificationApplyOperation operation = resolveModificationStrategy(path); - for (PathArgument pathArg : path.getPath()) { - modification = modification.modifyChild(pathArg); + 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, 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 @@ -146,30 +160,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.getOperation() == LogicalOperation.NONE) { + // 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; + } }