Merge pull request #5079 from evolvedbinary/refactor/query-materialization

Refactor to highlight materialization query execution model

Author: dizzzz

exist-core/pom.xml

@@ -762,6 +762,7 @@
                                 <exclude>src/main/java/org/exist/xmlrpc/ACEAiderSerializer.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/Cardinality.java</exclude>
                                 <exclude>src/test/java/org/exist/xquery/ImportModuleTest.java</exclude>
+                                <exclude>src/main/java/org/exist/xquery/Materializable.java</exclude>
                                 <exclude>src/test/java/org/exist/xquery/XQueryContextAttributesTest.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/functions/map/MapType.java</exclude>
                                 <exclude>src/test/java/org/exist/xquery/functions/session/AbstractSessionTest.java</exclude>
@@ -923,6 +924,7 @@ The original license statement is also included below.]]></preamble>
                                 <include>src/main/java/org/exist/xmlrpc/ACEAiderSerializer.java</include>
                                 <include>src/main/java/org/exist/xquery/Cardinality.java</include>
                                 <include>src/test/java/org/exist/xquery/ImportModuleTest.java</include>
+                                <include>src/main/java/org/exist/xquery/Materializable.java</include>
                                 <include>src/test/java/org/exist/xquery/XQueryContextAttributesTest.java</include>
                                 <include>src/main/java/org/exist/xquery/functions/map/MapType.java</include>
                                 <include>src/test/java/org/exist/xquery/functions/session/AbstractSessionTest.java</include>

exist-core/src/main/java/org/exist/dom/QName.java

@@ -21,7 +21,7 @@
  */
 package org.exist.dom;
 
-import org.exist.interpreter.Context;
+import org.exist.xquery.Context;
 import org.exist.storage.ElementValue;
 import org.exist.util.XMLNames;
 import org.exist.xquery.Constants;

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

@@ -274,7 +274,7 @@ private static final class IteratorItem extends OrderedLinkedList.Node {
         public IteratorItem(final NodeProxy proxy, final PathExpr expr) {
             this.proxy = proxy;
             try {
-                final Sequence seq = expr.eval(proxy);
+                final Sequence seq = expr.eval(proxy, null);
                 final StringBuilder buf = new StringBuilder();
                 final OrderedLinkedList strings = new OrderedLinkedList();
                 Item item;

exist-core/src/main/java/org/exist/http/urlrewrite/ModuleCall.java

@@ -95,12 +95,12 @@ public void doRewrite(final HttpServletRequest request, final HttpServletRespons
             final ContextItemDeclaration cid = call.getContext().getContextItemDeclartion();
             final Sequence contextSequence;
             if (cid != null) {
-                contextSequence = cid.eval(null);
+                contextSequence = cid.eval(null, null);
             } else {
                 contextSequence = null;
             }
 
-            final Sequence result = call.eval(contextSequence);
+            final Sequence result = call.eval(contextSequence, null);
             if (LOG.isDebugEnabled()) {
                 LOG.debug("Found: {}", result.getItemCount());
             }