[optimize] Reduce opportunities for over eager retrieval of persistent Nodes

Author: adamretter

exist-core/src/main/java/org/exist/dom/memtree/reference/AbstractReferenceNodeImpl.java

@@ -71,12 +71,20 @@ public String toString() {
 
     @Override
     public String getNamespaceURI() {
-        return getProxiedNode().getNamespaceURI();
+        final QName qname = getNodeProxy().getQName();
+        if (qname == null) {
+            return null;
+        }
+        return qname.getNamespaceURI();
     }
 
     @Override
     public String getLocalName() {
-        return getProxiedNode().getLocalName();
+        final QName qname = getNodeProxy().getQName();
+        if (qname == null) {
+            return null;
+        }
+        return qname.getLocalPart();
     }
 
     @Override
@@ -158,11 +166,11 @@ public String getNodeValue() throws DOMException {
 
     @Override
     public short getNodeType() {
-        return getProxiedNode().getNodeType();
+        return getNodeProxy().getNodeType();
     }
 
     @Override
     public QName getQName() {
-        return getProxiedNode().getQName();
+        return getNodeProxy().getQName();
     }
 }

exist-core/src/main/java/org/exist/dom/memtree/reference/ElementReferenceImpl.java

@@ -51,7 +51,11 @@ public int compareTo(final ElementReferenceImpl other) {
 
     @Override
     public String getTagName() {
-        return getProxiedNode().getTagName();
+        final QName qname = getNodeProxy().getQName();
+        if (qname == null) {
+            return null;
+        }
+        return qname.getStringValue();
     }
 
     @Override

exist-core/src/main/java/org/exist/dom/persistent/NodeProxy.java

@@ -137,6 +137,8 @@ public class NodeProxy implements NodeSet, NodeValue, NodeHandle, DocumentSet, C
 
     private final Expression expression;
 
+    private @Nullable WeakReference<Node> cachedNode = null;
+
     /**
      * Creates a new <code>NodeProxy</code> instance.
      *
@@ -233,6 +235,10 @@ public NodeProxy(final Expression expression, final DocumentImpl doc, final Node
         this.nodeId = nodeId;
     }
 
+    private void invalidateCachedNode() {
+        this.cachedNode = null;
+    }
+
     public void update(final ElementImpl element) {
         invalidateCachedNode();
         this.doc = element.getOwnerDocument();
@@ -322,6 +328,7 @@ public NodeId getNodeId() {
     @Override
     public QName getQName() {
         if (qname == null) {
+            // NOTE(AR) get the node from the database, which will also update the `qname`
             getNode();
         }
         return qname;
@@ -447,14 +454,7 @@ public DocumentImpl getOwnerDocument() {
      * @return a <code>boolean</code> value
      */
     public boolean isDocument() {
-        return nodeType == Node.DOCUMENT_NODE;
-    }
-
-
-    private @Nullable WeakReference<Node> cachedNode = null;
-
-    private void invalidateCachedNode() {
-        this.cachedNode = null;
+        return getNodeType() == Node.DOCUMENT_NODE;
     }
 
     /**
@@ -464,7 +464,8 @@ private void invalidateCachedNode() {
      */
     @Override
     public Node getNode() {
-        if (isDocument()) {
+        // NOTE(AR) we don't call isDocument() or getNodeType() here as it would call back to getNode() and cause a StackOverflowError
+        if (nodeType == Node.DOCUMENT_NODE) {
             return doc;
         }
 
@@ -481,7 +482,7 @@ public Node getNode() {
                 this.nodeType = realNode.getNodeType();
                 this.qname = realNode.getQName();
             }
-            cachedNode = new WeakReference<>(realNode);
+            this.cachedNode = new WeakReference<>(realNode);
             node = realNode;
         }
 
@@ -490,6 +491,10 @@ public Node getNode() {
 
     @Override
     public short getNodeType() {
+        if (nodeType == UNKNOWN_NODE_TYPE) {
+            // NOTE(AR) get the node from the database, which will also update the `nodeType`
+            getNode();
+        }
         return nodeType;
     }
 
@@ -851,12 +856,9 @@ public void toSAX(final DBBroker broker, final ContentHandler handler, final Pro
 
     @Override
     public void copyTo(final DBBroker broker, final DocumentBuilderReceiver receiver) throws SAXException {
-        NodeImpl node = null;
-        if(nodeType < 0) {
-            node = (NodeImpl) getNode();
-        }
-        if(nodeType == Node.ATTRIBUTE_NODE) {
-            final AttrImpl attr = (node == null ? (AttrImpl) getNode() : (AttrImpl) node);
+        final Node node = getNode();
+        if (node.getNodeType() == Node.ATTRIBUTE_NODE) {
+            final AttrImpl attr = (AttrImpl) node;
             receiver.attribute(attr.getQName(), attr.getValue());
         } else {
             receiver.addReferenceNode(this);
@@ -1344,6 +1346,7 @@ public NodeSet selectFollowing(final NodeSet following, final int position, fina
 
     @Override
     public NodeSet directSelectAttribute(final DBBroker broker, final NodeTest test, final int contextId) {
+        final short nodeType = getNodeType();
         if(nodeType != UNKNOWN_NODE_TYPE && nodeType != Node.ELEMENT_NODE) {
             return NodeSet.EMPTY_SET;
         }
@@ -1387,6 +1390,7 @@ public NodeSet directSelectAttribute(final DBBroker broker, final NodeTest test,
     }
 
     public NodeSet directSelectChild(final QName qname, final int contextId) {
+        final short nodeType = getNodeType();
         if(nodeType != UNKNOWN_NODE_TYPE && nodeType != Node.ELEMENT_NODE) {
             return NodeSet.EMPTY_SET;
         }
@@ -1609,6 +1613,7 @@ public boolean equalDocs(final DocumentSet other) {
 
     @Override
     public boolean directMatchAttribute(final DBBroker broker, final NodeTest test, final int contextId) {
+        final short nodeType = getNodeType();
         if(nodeType != UNKNOWN_NODE_TYPE && nodeType != Node.ELEMENT_NODE) {
             return false;
         }
@@ -1638,6 +1643,7 @@ public boolean directMatchAttribute(final DBBroker broker, final NodeTest test,
     }
 
     public boolean directMatchChild(final QName qname, final int contextId) {
+        final short nodeType = getNodeType();
         if(nodeType != UNKNOWN_NODE_TYPE && nodeType != Node.ELEMENT_NODE) {
             return false;
         }