Skip to content

[6.x.x] Improvements to XPath Axes navigation #164

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.

Sign up for GitHub

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

Merged
adamretter merged 13 commits into from
Dec 30, 2025
Merged

[6.x.x] Improvements to XPath Axes navigation #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1a10529
[bugfix] Raise error code XPTY0019 when an Atomic Value cannot be con…
adamretter Dec 18, 2025
d9828ca
[bugfix] Fix an issue with //following::node(), //preceding::node(), …
adamretter Dec 18, 2025
f29463a
[bugfix] Fix an issue whereby //@my-attribute worked but //(@my-attri…
adamretter Dec 18, 2025
93a307e
[bugfix] When removing duplicates from a ValueSequence ensure that th…
adamretter Dec 23, 2025
a9c68ce
[optimize] Avoid sorting twice when perfoming a union of nodes
adamretter Dec 23, 2025
50bce69
[bugfix] Add missing hashCode() method to DLNBase
adamretter Dec 30, 2025
1b8e922
[bugfix] Fix a bug in removing duplicate in-memory nodes from a sequence
adamretter Dec 30, 2025
5e95a37
[ignore] Small code cleanup to make tests more readable
adamretter Dec 30, 2025
def4c8b
[refactor] Make it clear that adding to an EmptyNodeSet is not possible
adamretter Dec 30, 2025
3344f29
[optimize] Reduce the memory used by intersect and except expressions
adamretter Dec 30, 2025
266e17d
[optimize] Reduce the memory used for comparing sequences of Item and…
adamretter Dec 30, 2025
cc03955
[bugfix] Empty In-memory NodeSet should have zero size
adamretter Dec 30, 2025
11d0683
[optimize] Reduce the memory used by sequences of Values
adamretter Dec 30, 2025
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
20 changes: 19 additions & 1 deletion exist-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,6 +776,7 @@
<include>src/test/resources/log4j2.xml</include>
<include>src/test/resources/standalone-webapp/WEB-INF/web.xml</include>
<include>src/main/xjb/rest-api.xjb</include>
<include>src/test/xquery/parenthesizedLocationStep.xml</include>
<include>src/test/xquery/tail-recursion.xml</include>
<include>src/test/xquery/maps/maps.xqm</include>
<include>src/test/xquery/numbers/format-numbers.xql</include>
Expand Down Expand Up @@ -888,6 +889,7 @@
<include>src/main/java/org/exist/dom/persistent/DocumentSet.java</include>
<include>src/main/java/org/exist/dom/persistent/DocumentTypeImpl.java</include>
<include>src/main/java/org/exist/dom/persistent/ElementImpl.java</include>
<include>src/main/java/org/exist/dom/persistent/EmptyNodeSet.java</include>
<include>src/main/java/org/exist/dom/persistent/LockToken.java</include>
<include>src/main/java/org/exist/dom/persistent/Match.java</include>
<include>src/main/java/org/exist/dom/persistent/NewArrayNodeSet.java</include>
Expand Down Expand Up @@ -950,6 +952,7 @@
<include>src/main/java/org/exist/management/impl/JMXAgent.java</include>
<include>src/main/java/org/exist/management/impl/SanityReport.java</include>
<include>src/main/java/org/exist/numbering/DLN.java</include>
<include>src/main/java/org/exist/numbering/DLNBase.java</include>
<include>src/main/java/org/exist/numbering/DLNFactory.java</include>
<include>src/test/java/org/exist/numbering/DLNStorageTest.java</include>
<include>src/main/java/org/exist/numbering/NodeId.java</include>
Expand Down Expand Up @@ -1179,12 +1182,14 @@
<include>src/test/java/org/exist/xquery/EmbeddedBinariesTest.java</include>
<include>src/test/java/org/exist/xquery/EmbeddedBinariesTest.java.java</include>
<include>src/main/java/org/exist/xquery/ErrorCodes.java</include>
<include>src/main/java/org/exist/xquery/Except.java</include>
<include>src/main/java/org/exist/xquery/ExternalModuleImpl.java</include>
<include>src/main/java/org/exist/xquery/FilteredExpression.java</include>
<include>src/test/java/org/exist/xquery/ForwardReferenceTest.java</include>
<include>src/main/java/org/exist/xquery/Function.java</include>
<include>src/main/java/org/exist/xquery/FunctionFactory.java</include>
<include>src/test/java/org/exist/xquery/InternalModuleTest.java</include>
<include>src/main/java/org/exist/xquery/Intersect.java</include>
<include>src/test/java/org/exist/xquery/LexerTest.java</include>
<include>src/main/java/org/exist/xquery/LocationStep.java</include>
<include>src/main/java/org/exist/xquery/Module.java</include>
Expand All @@ -1193,6 +1198,7 @@
<include>src/test/java/org/exist/xquery/NodeTypeTest.java</include>
<include>src/main/java/org/exist/xquery/Optimizer.java</include>
<include>src/main/java/org/exist/xquery/Option.java</include>
<include>src/main/java/org/exist/xquery/PathExpr.java</include>
<include>src/main/java/org/exist/xquery/PerformanceStats.java</include>
<include>src/test/java/org/exist/xquery/RestBinariesTest.java</include>
<include>src/test/java/org/exist/xquery/StoredModuleTest.java</include>
Expand Down Expand Up @@ -1269,6 +1275,7 @@
<include>src/main/java/org/exist/xquery/functions/fn/FunInsertBefore.java</include>
<include>src/main/java/org/exist/xquery/functions/fn/FunIRIToURI.java</include>
<include>src/main/java/org/exist/xquery/functions/fn/FunLang.java</include>
<include>src/test/java/org/exist/xquery/functions/fn/FunLangTest.java</include>
<include>src/main/java/org/exist/xquery/functions/fn/FunLast.java</include>
<include>src/main/java/org/exist/xquery/functions/fn/FunLocalName.java</include>
<include>src/main/java/org/exist/xquery/functions/fn/FunMax.java</include>
Expand Down Expand Up @@ -1409,13 +1416,15 @@
<include>src/main/java/org/exist/xquery/value/GYearMonthValue.java</include>
<include>src/main/java/org/exist/xquery/value/GYearValue.java</include>
<include>src/main/java/org/exist/xquery/value/IntegerValue.java</include>
<include>src/main/java/org/exist/xquery/value/MemoryNodeSet.java</include>
<include>src/main/java/org/exist/xquery/value/QNameValue.java</include>
<include>src/main/java/org/exist/xquery/value/SequenceType.java</include>
<include>src/main/java/org/exist/xquery/value/StringValue.java</include>
<include>src/test/java/org/exist/xquery/value/TimeTest.java</include>
<include>src/main/java/org/exist/xquery/value/TimeUtils.java</include>
<include>src/main/java/org/exist/xquery/value/TimeValue.java</include>
<include>src/main/java/org/exist/xquery/value/Type.java</include>
<include>src/main/java/org/exist/xquery/value/ValueSequence.java</include>
<include>src/test/java/org/exist/xquery/value/YearMonthDurationTest.java</include>
<include>src/main/java/org/exist/xquery/value/YearMonthDurationValue.java</include>
<include>src/main/java/org/exist/xslt/EXistURIResolver.java</include>
Expand Down Expand Up @@ -1460,6 +1469,7 @@
<exclude>src/test/resources/standalone-webapp/WEB-INF/web.xml</exclude>
<exclude>src/main/xjb/rest-api.xjb</exclude>
<exclude>src/test/xquery/binary-value.xqm</exclude>
<exclude>src/test/xquery/parenthesizedLocationStep.xml</exclude>
<exclude>src/test/xquery/pi.xqm</exclude>
<exclude>src/test/xquery/tail-recursion.xml</exclude>
<exclude>src/test/xquery/maps/maps.xqm</exclude>
Expand Down Expand Up @@ -1583,6 +1593,7 @@
<exclude>src/main/java/org/exist/dom/persistent/DocumentSet.java</exclude>
<exclude>src/main/java/org/exist/dom/persistent/DocumentTypeImpl.java</exclude>
<exclude>src/main/java/org/exist/dom/persistent/ElementImpl.java</exclude>
<exclude>src/main/java/org/exist/dom/persistent/EmptyNodeSet.java</exclude>
<exclude>src/main/java/org/exist/dom/persistent/LockToken.java</exclude>
<exclude>src/main/java/org/exist/dom/persistent/Match.java</exclude>
<exclude>src/main/java/org/exist/dom/persistent/NewArrayNodeSet.java</exclude>
Expand Down Expand Up @@ -1649,6 +1660,7 @@
<exclude>src/main/java/org/exist/mediatype/MediaTypeService.java</exclude>
<exclude>src/main/java/org/exist/mediatype/MediaTypeUtil.java</exclude>
<exclude>src/main/java/org/exist/numbering/DLN.java</exclude>
<exclude>src/main/java/org/exist/numbering/DLNBase.java</exclude>
<exclude>src/main/java/org/exist/numbering/DLNFactory.java</exclude>
<exclude>src/test/java/org/exist/numbering/DLNStorageTest.java</exclude>
<exclude>src/main/java/org/exist/numbering/NodeId.java</exclude>
Expand Down Expand Up @@ -1953,6 +1965,7 @@
<exclude>src/test/java/org/exist/xquery/EmbeddedBinariesTest.java</exclude>
<exclude>src/test/java/org/exist/xquery/EmbeddedBinariesTest.java.java</exclude>
<exclude>src/main/java/org/exist/xquery/ErrorCodes.java</exclude>
<exclude>src/main/java/org/exist/xquery/Except.java</exclude>
<exclude>src/main/java/org/exist/xquery/ExternalModuleImpl.java</exclude>
<exclude>src/main/java/org/exist/xquery/FilteredExpression.java</exclude>
<exclude>src/test/java/org/exist/xquery/ForwardReferenceTest.java</exclude>
Expand All @@ -1962,6 +1975,7 @@
<exclude>src/test/java/org/exist/xquery/ImportFromPkgTest.java</exclude>
<exclude>src/test/java/org/exist/xquery/ImportModuleTest.java</exclude>
<exclude>src/test/java/org/exist/xquery/InternalModuleTest.java</exclude>
<exclude>src/main/java/org/exist/xquery/Intersect.java</exclude>
<exclude>src/main/java/org/exist/xquery/JavaBinding.java</exclude>
<exclude>src/test/resources-filtered/org/exist/xquery/JavaBindingTest.conf.xml</exclude>
<exclude>src/test/java/org/exist/xquery/JavaBindingTest.java</exclude>
Expand All @@ -1974,6 +1988,7 @@
<exclude>src/test/java/org/exist/xquery/NodeTypeTest.java</exclude>
<exclude>src/main/java/org/exist/xquery/Optimizer.java</exclude>
<exclude>src/main/java/org/exist/xquery/Option.java</exclude>
<exclude>src/main/java/org/exist/xquery/PathExpr.java</exclude>
<exclude>src/main/java/org/exist/xquery/PerformanceStats.java</exclude>
<exclude>src/test/java/org/exist/xquery/RestBinariesTest.java</exclude>
<exclude>src/test/java/org/exist/xquery/StoredModuleTest.java</exclude>
Expand Down Expand Up @@ -2054,6 +2069,7 @@
<exclude>src/main/java/org/exist/xquery/functions/fn/FunInsertBefore.java</exclude>
<exclude>src/main/java/org/exist/xquery/functions/fn/FunIRIToURI.java</exclude>
<exclude>src/main/java/org/exist/xquery/functions/fn/FunLang.java</exclude>
<exclude>src/test/java/org/exist/xquery/functions/fn/FunLangTest.java</exclude>
<exclude>src/main/java/org/exist/xquery/functions/fn/FunLast.java</exclude>
<exclude>src/main/java/org/exist/xquery/functions/fn/FunLocalName.java</exclude>
<exclude>src/main/java/org/exist/xquery/functions/fn/FunMax.java</exclude>
Expand Down Expand Up @@ -2217,6 +2233,7 @@
<exclude>src/main/java/org/exist/xquery/value/GYearValue.java</exclude>
<exclude>src/main/java/org/exist/xquery/value/IntegerValue.java</exclude>
<exclude>src/main/java/org/exist/xquery/value/ItemComparator.java</exclude>
<exclude>src/main/java/org/exist/xquery/value/MemoryNodeSet.java</exclude>
<exclude>src/main/java/org/exist/xquery/value/QNameValue.java</exclude>
<exclude>src/main/java/org/exist/xquery/value/SequenceComparator.java</exclude>
<exclude>src/main/java/org/exist/xquery/value/SequenceType.java</exclude>
Expand All @@ -2228,6 +2245,7 @@
<exclude>src/main/java/org/exist/xquery/value/TimeUtils.java</exclude>
<exclude>src/main/java/org/exist/xquery/value/TimeValue.java</exclude>
<exclude>src/main/java/org/exist/xquery/value/Type.java</exclude>
<exclude>src/main/java/org/exist/xquery/value/ValueSequence.java</exclude>
<exclude>src/test/java/org/exist/xquery/value/YearMonthDurationTest.java</exclude>
<exclude>src/main/java/org/exist/xquery/value/YearMonthDurationValue.java</exclude>
<exclude>src/main/java/org/exist/xslt/EXistURIResolver.java</exclude>
Expand Down Expand Up @@ -2715,4 +2733,4 @@ The BaseX Team. The original license statement is also included below.]]></pream
</profile>
</profiles>

</project>
</project>
33 changes: 26 additions & 7 deletions exist-core/src/main/antlr/org/exist/xquery/parser/XQueryTree.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2801,19 +2801,38 @@ throws PermissionDeniedException, EXistException, XPathException
rs.setAxis(Constants.DESCENDANT_AXIS);
} else if (rs.getAxis() == Constants.SELF_AXIS) {
rs.setAxis(Constants.DESCENDANT_SELF_AXIS);
} else {
} else if (rs.getAxis() == Constants.CHILD_AXIS || rs.getAxis() == Constants.UNKNOWN_AXIS) {
// For CHILD_AXIS or UNKNOWN_AXIS, change to descendant-or-self
rs.setAxis(Constants.DESCENDANT_SELF_AXIS);
rs.setAbbreviated(true);
} else {
// For other explicit axes (following, preceding, ancestor, etc.)
// insert a separate descendant-or-self::node() step before this step
final LocationStep dsStep = new LocationStep(context, Constants.DESCENDANT_SELF_AXIS, new AnyNodeTest());
path.insertBeforeLast(dsStep);
}

} else {
rightStep.setPrimaryAxis(Constants.DESCENDANT_SELF_AXIS);
if(rightStep instanceof VariableReference) {
rightStep = new SimpleStep(context, Constants.DESCENDANT_SELF_AXIS, rightStep);
path.replaceLastExpression(rightStep);
} else if (rightStep instanceof FilteredExpression)
((FilteredExpression)rightStep).setAbbreviated(true);
if (rightStep instanceof Function) {
// For non-LocationStep expressions (function calls, etc.)
// insert a separate descendant-or-self::node() step before this step
final LocationStep dsStep = new LocationStep(context, Constants.DESCENDANT_SELF_AXIS, new AnyNodeTest());
path.insertBeforeLast(dsStep);
} else {
if (rightStep.getPrimaryAxis() == Constants.ATTRIBUTE_AXIS) {
rightStep.setPrimaryAxis(Constants.DESCENDANT_ATTRIBUTE_AXIS);
} else {
rightStep.setPrimaryAxis(Constants.DESCENDANT_SELF_AXIS);
}

if(rightStep instanceof VariableReference) {
// VariableReference needs special handling
rightStep = new SimpleStep(context, Constants.DESCENDANT_SELF_AXIS, rightStep);
path.replaceLastExpression(rightStep);
} else if (rightStep instanceof FilteredExpression) {
((FilteredExpression)rightStep).setAbbreviated(true);
}
}
}
}
)?
Expand Down
26 changes: 26 additions & 0 deletions exist-core/src/main/java/org/exist/dom/persistent/EmptyNodeSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,28 @@
/*
* Elemental
* Copyright (C) 2024, Evolved Binary Ltd
*
* admin@evolvedbinary.com
* https://www.evolvedbinary.com | https://www.elemental.xyz
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; version 2.1.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* NOTE: Parts of this file contain code from 'The eXist-db Authors'.
* The original license header is included below.
*
* =====================================================================
*
* eXist-db Open Source Native XML Database
* Copyright (C) 2001 The eXist-db Authors
*
Expand Down Expand Up @@ -67,10 +91,12 @@ public boolean hasOne() {

@Override
public void add(final NodeProxy proxy) {
throw new IllegalStateException("Cannot add a NodeProxy to an EmptyNodeSet because it is immutable");
}

@Override
public void addAll(final NodeSet other) {
throw new IllegalStateException("Cannot add a NodeSet to an EmptyNodeSet because it is immutable");
}

@Override
Expand Down
33 changes: 32 additions & 1 deletion exist-core/src/main/java/org/exist/numbering/DLNBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,28 @@
/*
* Elemental
* Copyright (C) 2024, Evolved Binary Ltd
*
* admin@evolvedbinary.com
* https://www.evolvedbinary.com | https://www.elemental.xyz
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; version 2.1.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* NOTE: Parts of this file contain code from 'The eXist-db Authors'.
* The original license header is included below.
*
* =====================================================================
*
* eXist-db Open Source Native XML Database
* Copyright (C) 2001 The eXist-db Authors
*
Expand Down Expand Up @@ -495,7 +519,14 @@ public boolean equals(final Object o) {
return Arrays.equals(bits, other.bits);
}

// public int compareTo(final DLNBase other) {
@Override
public int hashCode() {
int result = Arrays.hashCode(bits);
result = 31 * result + bitIndex;
return result;
}

// public int compareTo(final DLNBase other) {
// if (other == null)
// return 1;
// final int a1len = bits.length;
Expand Down
Loading