package org.opendaylight.yangtools.yang.data.impl.schema.tree;
import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Nonnull;
+import javax.annotation.concurrent.NotThreadSafe;
import org.opendaylight.yangtools.concepts.Identifiable;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument;
+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.tree.ModificationType;
import org.opendaylight.yangtools.yang.data.api.schema.tree.StoreTreeNode;
import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode;
-import javax.annotation.concurrent.GuardedBy;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
/**
* Node Modification Node and Tree
*
* This tree is lazily created and populated via {@link #modifyChild(PathArgument)}
* and {@link StoreMetadataNode} which represents original state {@link #getOriginal()}.
*/
+@NotThreadSafe
final class ModifiedNode implements StoreTreeNode<ModifiedNode>, Identifiable<PathArgument>, NodeModification {
public static final Predicate<ModifiedNode> IS_TERMINAL_PREDICATE = new Predicate<ModifiedNode>() {
@Override
- public boolean apply(final ModifiedNode input) {
+ public boolean apply(final @Nonnull ModifiedNode input) {
+ Preconditions.checkNotNull(input);
switch (input.getType()) {
case DELETE:
case MERGE:
}
};
- private final Map<PathArgument, ModifiedNode> children = new LinkedHashMap<>();
+ private final Map<PathArgument, ModifiedNode> children;
private final Optional<TreeNode> original;
private final PathArgument identifier;
private ModificationType modificationType = ModificationType.UNMODIFIED;
private Optional<TreeNode> snapshotCache;
private NormalizedNode<?, ?> value;
- private ModifiedNode(final PathArgument identifier, final Optional<TreeNode> original) {
+ private ModifiedNode(final PathArgument identifier, final Optional<TreeNode> original, final boolean isOrdered) {
this.identifier = identifier;
this.original = original;
+
+ if (isOrdered) {
+ children = new LinkedHashMap<>();
+ } else {
+ children = new HashMap<>();
+ }
}
/**
* @return {@link org.opendaylight.controller.md.sal.dom.store.impl.tree.data.ModifiedNode} for specified child, with {@link #getOriginal()}
* containing child metadata if child was present in original data.
*/
- public ModifiedNode modifyChild(final PathArgument child) {
+ public ModifiedNode modifyChild(final PathArgument child, final boolean isOrdered) {
clearSnapshot();
if (modificationType == ModificationType.UNMODIFIED) {
updateModificationType(ModificationType.SUBTREE_MODIFIED);
currentMetadata = Optional.absent();
}
- ModifiedNode newlyCreated = new ModifiedNode(child, currentMetadata);
+ ModifiedNode newlyCreated = new ModifiedNode(child, currentMetadata, isOrdered);
children.put(child, newlyCreated);
return newlyCreated;
}
*
*/
public void delete() {
+ final ModificationType newType;
+
+ switch (modificationType) {
+ case DELETE:
+ case UNMODIFIED:
+ // We need to record this delete.
+ newType = ModificationType.DELETE;
+ break;
+ case MERGE:
+ case SUBTREE_MODIFIED:
+ case WRITE:
+ /*
+ * We are canceling a previous modification. This is a bit tricky,
+ * as the original write may have just introduced the data, or it
+ * may have modified it.
+ *
+ * As documented in BUG-2470, a delete of data introduced in this
+ * transaction needs to be turned into a no-op.
+ */
+ newType = original.isPresent() ? ModificationType.DELETE : ModificationType.UNMODIFIED;
+ break;
+ default:
+ throw new IllegalStateException("Unhandled deletion of node with " + modificationType);
+ }
+
clearSnapshot();
- updateModificationType(ModificationType.DELETE);
children.clear();
this.value = null;
+ updateModificationType(newType);
}
/**
this.value = data;
}
+ /**
+ * Seal the modification node and prune any children which has not been
+ * modified.
+ */
void seal() {
clearSnapshot();
- for (ModifiedNode child : children.values()) {
+
+ // Walk all child nodes and remove any children which have not
+ // been modified.
+ final Iterator<ModifiedNode> it = children.values().iterator();
+ while (it.hasNext()) {
+ final ModifiedNode child = it.next();
child.seal();
+
+ if (child.modificationType == ModificationType.UNMODIFIED) {
+ it.remove();
+ }
+ }
+
+ // A SUBTREE_MODIFIED node without any children is a no-op
+ if (modificationType == ModificationType.SUBTREE_MODIFIED && children.isEmpty()) {
+ updateModificationType(ModificationType.UNMODIFIED);
}
}
return Optional.fromNullable(snapshotCache);
}
- @GuardedBy("this")
private void updateModificationType(final ModificationType type) {
modificationType = type;
clearSnapshot();
+ modificationType + ", childModification=" + children + "]";
}
- public static ModifiedNode createUnmodified(final TreeNode metadataTree) {
- return new ModifiedNode(metadataTree.getIdentifier(), Optional.of(metadataTree));
+ /**
+ * Create a node which will reflect the state of this node, except it will behave as newly-written
+ * value. This is useful only for merge validation.
+ *
+ * @param value Value associated with the node
+ * @return An isolated node. This node should never reach a datatree.
+ */
+ ModifiedNode asNewlyWritten(final NormalizedNode<?, ?> value) {
+ final ModifiedNode ret = new ModifiedNode(getIdentifier(), Optional.<TreeNode>absent(), false);
+ ret.write(value);
+ return ret;
+ }
+
+ public static ModifiedNode createUnmodified(final TreeNode metadataTree, final boolean isOrdered) {
+ return new ModifiedNode(metadataTree.getIdentifier(), Optional.of(metadataTree), isOrdered);
}
}
Code Review / yangtools.git / blobdiff