DocumentRequest performance enhancements (Simupedia)

[simantics/platform.git] / bundles / org.simantics.document.server / src / org / simantics / document / server / request / NodeRequest.java

diff --git a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodeRequest.java b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodeRequest.java
index 71b66a76ba8ea32f9909e5785b0c89a279fd39d8..98bd0fb821dc0286238da7a310c85149247633a0 100644 (file)
--- a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodeRequest.java
+++ b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodeRequest.java
@@ -1,6 +1,7 @@
 package org.simantics.document.server.request;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -8,11 +9,13 @@ import org.simantics.db.ReadGraph;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.request.VariableRead;
 import org.simantics.db.layer0.variable.Variable;
+import org.simantics.document.server.DocumentServerUtils.AttributesRequest;
 import org.simantics.document.server.JSONObject;
+import org.simantics.utils.datastructures.Pair;
 
 public class NodeRequest extends VariableRead<JSONObject> {
-    
-    public static String ERRORS = "Errors";
+
+    public static final String ERRORS = "Errors";
 
        public NodeRequest(Variable node) {
                super(node);
@@ -21,38 +24,53 @@ public class NodeRequest extends VariableRead<JSONObject> {
        @SuppressWarnings("unchecked")
     @Override
        public JSONObject perform(ReadGraph graph) throws DatabaseException {
-               
+
                long s = System.nanoTime();
 
-           JSONObject staticContent = graph.syncRequest(new NodeRequestStatic(variable));
+               Pair<JSONObject, Collection<Variable>> attribs = graph.syncRequest(new AttributesRequest(variable));
+
+           JSONObject staticContent = attribs.first;
+           if(attribs.second.isEmpty()) {
+
+               if(DocumentRequest.PROFILE) {
+                       long dura = System.nanoTime()-s;
+                   if(dura > DocumentRequest.PROFILE_THRESHOLD_NODEREQUEST * 1e3) {
+                       System.err.println("NodeRequest " + System.identityHashCode(this) + " in " + 1e-6*dura + "ms. " + variable.getURI(graph));
+                   }
+               }
+
+               return staticContent;
+           }
+
            Map<String,Object> dynamicContent = graph.syncRequest(new NodeRequestDynamic(variable));
-           
            if(dynamicContent.isEmpty()) {
                return staticContent;
            }
-           
+
         JSONObject result = staticContent.clone();
         result.add(dynamicContent);
 
         if(dynamicContent.containsKey(ERRORS) || staticContent.getJSONField(ERRORS) != null) {
-            ArrayList<String> errorList = new ArrayList<String>();
-            
+            ArrayList<String> errorList = new ArrayList<>();
+
             if(dynamicContent.containsKey(ERRORS))
                 errorList.addAll((List<String>)dynamicContent.get(ERRORS));
-            
+
             if(staticContent.getJSONField(ERRORS) != null)
                 errorList.addAll((List<String>)staticContent.getJSONField(ERRORS));
-            
+
             result.addJSONField(ERRORS, errorList);
         }
-        
+
         if(DocumentRequest.PROFILE) {
-               long dura = System.nanoTime()-s;
-               System.err.println("NodeRequest " + System.identityHashCode(this) + " " + variable.getURI(graph) + " in " + 1e-6*dura + "ms." + result);
+            long dura = System.nanoTime()-s;
+            if(dura > DocumentRequest.PROFILE_THRESHOLD_NODEREQUEST * 1e3) {
+                System.err.println("NodeRequest " + System.identityHashCode(this) + " in " + 1e-6*dura + "ms. " + variable.getURI(graph));
+            }
         }
         
-           return result;
+        return result;
 
-       }               
+    }
 
 }
\ No newline at end of file