From d49ac5a3f5512614b3b0c2c5c25ae5f940f47dec Mon Sep 17 00:00:00 2001
From: Robert Varga <rovarga@cisco.com>
Date: Tue, 20 Sep 2016 02:59:00 +0200
Subject: [PATCH] Make sure we optimize DOMDataTreeIdentifier

DOMDataTreeIdentifier inside a shard is heavily reused. Do not trust
the user to give us an optimized YangInstanceIdentifier but try
optimizing it.

Change-Id: I8a73b21562393a5f9100359d5ffaf3e2af057b6e
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit 7488878f65eef4396e5985f2228fbbad2f05d536)
---
 .../mdsal/dom/api/DOMDataTreeIdentifier.java             | 9 ++++++++-
 .../dom/store/inmemory/InMemoryDOMDataTreeShard.java     | 4 ++--
 .../store/inmemory/ModificationContextNodeBuilder.java   | 8 +++-----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMDataTreeIdentifier.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMDataTreeIdentifier.java
index c61722c5b4..2d4b4f9498 100644
--- a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMDataTreeIdentifier.java
+++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMDataTreeIdentifier.java
@@ -24,8 +24,10 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgum
  * A unique identifier for a particular subtree. It is composed of the logical
  * data store type and the instance identifier of the root node.
  */
-public final class DOMDataTreeIdentifier implements Immutable, Path<DOMDataTreeIdentifier>, Serializable, Comparable<DOMDataTreeIdentifier> {
+public final class DOMDataTreeIdentifier implements Immutable, Path<DOMDataTreeIdentifier>, Serializable,
+        Comparable<DOMDataTreeIdentifier> {
     private static final long serialVersionUID = 1L;
+
     private final YangInstanceIdentifier rootIdentifier;
     private final LogicalDatastoreType datastoreType;
 
@@ -57,6 +59,11 @@ public final class DOMDataTreeIdentifier implements Immutable, Path<DOMDataTreeI
         return datastoreType == other.datastoreType && rootIdentifier.contains(other.rootIdentifier);
     }
 
+    public DOMDataTreeIdentifier toOptimized() {
+        final YangInstanceIdentifier opt = rootIdentifier.toOptimized();
+        return opt == rootIdentifier ? this : new DOMDataTreeIdentifier(datastoreType, opt);
+    }
+
     @Override
     public int hashCode() {
         final int prime = 31;
diff --git a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMDataTreeShard.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMDataTreeShard.java
index afdc2ee280..97b2354f9a 100644
--- a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMDataTreeShard.java
+++ b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMDataTreeShard.java
@@ -91,7 +91,7 @@ public class InMemoryDOMDataTreeShard implements ReadableWriteableDOMDataTreeSha
     public static InMemoryDOMDataTreeShard create(final DOMDataTreeIdentifier id,
                                                   final Executor dataTreeChangeExecutor,
                                                   final int maxDataChangeListenerQueueSize) {
-        return new InMemoryDOMDataTreeShard(id, dataTreeChangeExecutor,
+        return new InMemoryDOMDataTreeShard(id.toOptimized(), dataTreeChangeExecutor,
                 maxDataChangeListenerQueueSize, DEFAULT_SUBMIT_QUEUE_SIZE);
     }
 
@@ -99,7 +99,7 @@ public class InMemoryDOMDataTreeShard implements ReadableWriteableDOMDataTreeSha
                                                   final Executor dataTreeChangeExecutor,
                                                   final int maxDataChangeListenerQueueSize,
                                                   final int submitQueueSize) {
-        return new InMemoryDOMDataTreeShard(id, dataTreeChangeExecutor,
+        return new InMemoryDOMDataTreeShard(id.toOptimized(), dataTreeChangeExecutor,
                 maxDataChangeListenerQueueSize, submitQueueSize);
     }
 
diff --git a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ModificationContextNodeBuilder.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ModificationContextNodeBuilder.java
index 317dc920be..a98205df02 100644
--- a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ModificationContextNodeBuilder.java
+++ b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ModificationContextNodeBuilder.java
@@ -10,7 +10,6 @@ package org.opendaylight.mdsal.dom.store.inmemory;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 
 abstract class ModificationContextNodeBuilder<T extends WriteableModificationNode> {
@@ -32,10 +31,9 @@ abstract class ModificationContextNodeBuilder<T extends WriteableModificationNod
     }
 
     final T build() {
-        HashMap<PathArgument, WriteableModificationNode> builtChildren =
-                new HashMap<PathArgument, WriteableModificationNode>(boundaryChildren);
-        for (Entry<PathArgument, InteriorNodeBuilder> interiorNode : interiorChildren.entrySet()) {
-            WriteableModificationNode builded = interiorNode.getValue().build();
+        final Map<PathArgument, WriteableModificationNode> builtChildren = new HashMap<>(boundaryChildren);
+        for (InteriorNodeBuilder interiorNode : interiorChildren.values()) {
+            WriteableModificationNode builded = interiorNode.build();
             builtChildren.put(builded.getIdentifier(), builded);
         }
 
-- 
2.36.6