Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[6.x.x] Refactor to highlight materialization query execution model #5080

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions exist-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -705,6 +705,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>
Expand Down Expand Up @@ -856,6 +857,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>
Expand Down
2 changes: 1 addition & 1 deletion exist-core/src/main/java/org/exist/dom/QName.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down
62 changes: 0 additions & 62 deletions exist-core/src/main/java/org/exist/interpreter/Compiled.java

This file was deleted.

54 changes: 0 additions & 54 deletions exist-core/src/main/java/org/exist/interpreter/Compiler.java

This file was deleted.

228 changes: 0 additions & 228 deletions exist-core/src/main/java/org/exist/interpreter/ContextNS.java

This file was deleted.

Loading
Loading