Add a cache for NodeLookup

This reintroduces a previously introduced cache with an improvement to add every node seen during lookup instead only the nodes found.
miho · Sep 27, 2018 · 3226172 · 3226172
1 parent 12ab916
commit 3226172
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/VWorkflows-Core/src/main/java/eu/mihosoft/vrl/workflow/FlowModelImpl.java b/VWorkflows-Core/src/main/java/eu/mihosoft/vrl/workflow/FlowModelImpl.java
@@ -187,6 +187,7 @@ public VNode remove(VNode n) {
 //            ((FlowModel)n).clear();
 //        }
         VNode result = nodes.remove(n.getId());
+        nodeLookup.invalidateCache();
         observableNodes.remove(n);
 
 //        removeNodeSkin(n);

diff --git a/VWorkflows-Core/src/main/java/eu/mihosoft/vrl/workflow/NodeLookup.java b/VWorkflows-Core/src/main/java/eu/mihosoft/vrl/workflow/NodeLookup.java
@@ -48,4 +48,9 @@ public interface NodeLookup extends Lookup<VNode> {
      * such connector exists
      */
     public Connector getConnectorById(String id);
+
+    /**
+     * Invalidates the Lookup cache;
+     */
+    default void invalidateCache() {};
 }
diff --git a/VWorkflows-Core/src/main/java/eu/mihosoft/vrl/workflow/NodeLookupImpl.java b/VWorkflows-Core/src/main/java/eu/mihosoft/vrl/workflow/NodeLookupImpl.java
@@ -33,6 +33,7 @@
  */
 package eu.mihosoft.vrl.workflow;
 
+import java.util.HashMap;
 import java.util.Objects;
 
 /**
@@ -46,7 +47,7 @@
 public class NodeLookupImpl implements NodeLookup {
 
     private final VFlowModel root;
-//    private final Map<String, VNode> cache = new HashMap<>();
+    private HashMap<String, VNode> cache = new HashMap<String, VNode>();
 
     public NodeLookupImpl(VFlowModel root) {
         this.root = root;
@@ -75,18 +76,21 @@ public Connector getConnectorById(String globalId) {
 
     @Override
     public VNode getById(String globalId) {
+        VNode result = cache.get(globalId);
 
-//        VNode result = cache.get(globalId);
-
-//        if (result!=null)return result;
-
-        VNode result = getNodeByGlobalId(root, globalId);
-
-//        cache.put(globalId, result);
-
+        if (result == null) {
+            result = getNodeByGlobalId(root, globalId);
+            cache.put(globalId, result);
+        }
         return result;
     }
 
+    @Override
+    public void invalidateCache() {
+        System.out.println("Cache invalidated");
+        cache.clear();
+    }
+
     private VNode getNodeByGlobalId(VFlowModel parent, String id) {
 
         if (Objects.equals(parent.getId(),id)) {
@@ -97,7 +101,7 @@ private VNode getNodeByGlobalId(VFlowModel parent, String id) {
             if (n.getId().equals(id)) {
                 return n;
             }
-
+            cache.put(n.getId(), n);
             if (n instanceof FlowModel) {
                 VNode result = getNodeByGlobalId((VFlowModel) n, id);
                 if (result != null) {

diff --git a/VWorkflows-Core/src/main/java/eu/mihosoft/vrl/workflow/VFlowImpl.java b/VWorkflows-Core/src/main/java/eu/mihosoft/vrl/workflow/VFlowImpl.java
@@ -472,6 +472,7 @@ public ObservableList<VNode> getNodes() {
 
     @Override
     public VNode remove(VNode n) {
+        getNodeLookup().invalidateCache();
         return getModel().remove(n);
     }