Skip to content

[7.x.x] Only lock queries whilst they are compiling#229

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 16 commits into from
Jul 13, 2026
Merged

[7.x.x] Only lock queries whilst they are compiling #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4ca2bbd
[test] Tests for performing actions against the Source Document of a …
adamretter Jan 16, 2026
5614a94
[bugfix] Avoid NPE when releasing a lock if it is already released
adamretter Jan 28, 2026
06d275c
[refactor] Cleanup Source
adamretter Jul 9, 2026
01a506e
[ignore] Cleanup legacy source revision identifier
adamretter Jul 9, 2026
5044632
[refactor] Improve properties based configuration of tests
adamretter Jul 9, 2026
b0f40b4
[bugfix] Improve error message when Java binding instance is of the w…
adamretter Jul 9, 2026
1aea0fa
[bugfix] Make XML:DB API consistent with other APIs regarding XQuery …
adamretter Jul 9, 2026
f422250
[bugfix] Add a Source that retrieves content by URI
adamretter Jul 9, 2026
4d7cfd2
[refactor] Cleanup database document use and locking in XIncludeFilter
adamretter Jul 10, 2026
98bb7ec
[refactor] Replace DBSource with DbUriSource
adamretter Jul 10, 2026
582488c
[refactor] Split XQueryUtil into compile and execute phases
adamretter Jul 11, 2026
ae2b90c
[refactor] Remove polution of XML:DB API into the Query Engine
adamretter Jul 11, 2026
ccaa6f2
[bugfix] When executing an XQuery that is stored in the database via …
adamretter Jul 11, 2026
2413fba
[bugfix] Make sure that the REST Server correctly caches and frees qu…
adamretter Jul 11, 2026
06c5608
[bugfix] When executing an XQuery that is stored in the database via …
adamretter Jul 11, 2026
3a8c6ab
[refactor] Make sure that XML:DB Remote and XML-RPC APIs do not leak …
adamretter Jul 12, 2026
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
38 changes: 37 additions & 1 deletion exist-core/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1044,12 +1044,15 @@
<include>src/test/java/org/exist/security/internal/BackupRestoreSecurityPrincipalsTest.java</include>
<include>src/main/java/org/exist/security/internal/RealmImpl.java</include>
<include>src/main/java/org/exist/security/internal/SecurityManagerImpl.java</include>
<include>src/main/java/org/exist/security/internal/SMEvents.java</include>
<include>src/main/java/org/exist/security/internal/aider/UnixStylePermissionAider.java</include>
<include>src/main/java/org/exist/security/management/AccountsManagement.java</include>
<include>src/main/java/org/exist/security/management/GroupsManagement.java</include>
<include>src/main/java/org/exist/source/AbstractSource.java</include>
<include>src/main/java/org/exist/source/DBSource.java</include>
<include>src/main/java/org/exist/source/Source.java</include>
<include>src/main/java/org/exist/source/SourceFactory.java</include>
<include>src/test/java/org/exist/source/SourceFactoryTest.java</include>
<include>src/main/java/org/exist/source/URLSource.java</include>
<include>src/test/java/org/exist/stax/EmbeddedXMLStreamReaderTest.java</include>
<include>src/test/java/org/exist/storage/AbstractUpdateTest.java</include>
Expand DownExpand Up@@ -1117,6 +1120,8 @@
<include>src/test/resources-filtered/org/exist/storage/statistics/conf.xml</include>
<include>src/main/java/org/exist/storage/sync/SyncTask.java</include>
<include>src/test/java/org/exist/storage/util/PauseFunction.java</include>
<include>src/main/java/org/exist/test/ExistEmbeddedServer.java</include>
<include>src/main/java/org/exist/test/ExistWebServer.java</include>
<include>src/main/java/org/exist/test/ExistXmldbEmbeddedServer.java</include>
<include>src/main/java/org/exist/test/TransactionTestDSL.java</include>
<include>src/main/java/org/exist/test/XQueryAssertions.java</include>
Expand DownExpand Up@@ -1262,11 +1267,15 @@
<include>src/test/java/org/exist/xmldb/concurrent/action/ValueAppendAction.java</include>
<include>src/test/java/org/exist/xmldb/concurrent/action/XQueryAction.java</include>
<include>src/test/java/org/exist/xmldb/concurrent/action/XQueryUpdateAction.java</include>
<include>src/main/java/org/exist/xmlrpc/AbstractCachedResult.java</include>
<include>src/main/java/org/exist/xmlrpc/CachedQueryResult.java</include>
<include>src/main/java/org/exist/xmlrpc/ExistRpcTypeFactory.java</include>
<include>src/test/java/org/exist/xmlrpc/MimeTypeTest.java</include>
<include>src/main/java/org/exist/xmlrpc/QueryResultCache.java</include>
<include>src/test/java/org/exist/xmlrpc/QuerySessionTest.java</include>
<include>src/main/java/org/exist/xmlrpc/RpcAPI.java</include>
<include>src/main/java/org/exist/xmlrpc/RpcConnection.java</include>
<include>src/main/java/org/exist/xmlrpc/XmldbRequestProcessorFactory.java</include>
<include>src/test/java/org/exist/xmlrpc/XmlRpcTest.java</include>
<include>src/main/java/org/exist/xqj/Marshaller.java</include>
<include>src/test/java/org/exist/xqj/MarshallerTest.java</include>
Expand All@@ -1277,6 +1286,7 @@
<include>src/main/java/org/exist/xquery/ArrowOperator.java</include>
<include>src/test/java/org/exist/xquery/CardinalityTest.java</include>
<include>src/test/java/org/exist/xquery/CleanupTest.java</include>
<include>src/main/java/org/exist/xquery/CompiledXQuery.java</include>
<include>src/test/java/org/exist/xquery/ConstructedNodesRecoveryTest.java</include>
<include>src/test/java/org/exist/xquery/ConstructedNodesTest.java</include>
<include>src/main/java/org/exist/xquery/Context.java</include>
Expand DownExpand Up@@ -1493,6 +1503,7 @@
<include>src/test/java/org/exist/xquery/functions/util/Base64FunctionsTest.java</include>
<include>src/test/java/org/exist/xquery/functions/util/BaseConverterTest.java</include>
<include>src/main/java/org/exist/xquery/functions/util/BuiltinFunctions.java</include>
<include>src/main/java/org/exist/xquery/functions/util/CollectionName.java</include>
<include>src/main/java/org/exist/xquery/functions/util/DescribeFunction.java</include>
<include>src/test/java/org/exist/xquery/functions/util/EvalTest.java</include>
<include>src/test/java/org/exist/xquery/functions/util/ExpandTest.java</include>
Expand DownExpand Up@@ -1881,12 +1892,18 @@
<exclude>src/test/java/org/exist/security/internal/BackupRestoreSecurityPrincipalsTest.java</exclude>
<exclude>src/main/java/org/exist/security/internal/RealmImpl.java</exclude>
<exclude>src/main/java/org/exist/security/internal/SecurityManagerImpl.java</exclude>
<exclude>src/main/java/org/exist/security/internal/SMEvents.java</exclude>
<exclude>src/main/java/org/exist/security/internal/aider/ImmutableUnixStylePermissionAider.java</exclude>
<exclude>src/main/java/org/exist/security/internal/aider/UnixStylePermissionAider.java</exclude>
<exclude>src/main/java/org/exist/security/management/AccountsManagement.java</exclude>
<exclude>src/main/java/org/exist/security/management/GroupsManagement.java</exclude>
<exclude>src/main/java/org/exist/source/AbstractSource.java</exclude>
<exclude>src/main/java/org/exist/source/DBSource.java</exclude>
<exclude>src/main/java/org/exist/source/DbStoreSource.java</exclude>
<exclude>src/main/java/org/exist/source/DbUriSource.java</exclude>
<exclude>src/main/java/org/exist/source/Source.java</exclude>
<exclude>src/main/java/org/exist/source/SourceFactory.java</exclude>
<exclude>src/test/java/org/exist/source/SourceFactoryTest.java</exclude>
<exclude>src/main/java/org/exist/source/URLSource.java</exclude>
<exclude>src/test/java/org/exist/stax/EmbeddedXMLStreamReaderTest.java</exclude>
<exclude>src/test/java/org/exist/storage/AbstractRecoverTest.java</exclude>
Expand DownExpand Up@@ -2010,6 +2027,8 @@
<exclude>src/test/java/org/exist/storage/txn/TxnTest.java</exclude>
<exclude>src/test/java/org/exist/storage/util/PauseFunction.java</exclude>
<exclude>src/main/java/org/exist/test/DiffMatcher.java</exclude>
<exclude>src/main/java/org/exist/test/ExistEmbeddedServer.java</exclude>
<exclude>src/main/java/org/exist/test/ExistWebServer.java</exclude>
<exclude>src/main/java/org/exist/test/ExistXmldbEmbeddedServer.java</exclude>
<exclude>src/main/java/org/exist/test/TransactionTestDSL.java</exclude>
<exclude>src/test/java/org/exist/test/Util.java</exclude>
Expand DownExpand Up@@ -2117,6 +2136,7 @@
<exclude>src/main/java/org/exist/xmldb/LocalBinaryResource.java</exclude>
<exclude>src/main/java/org/exist/xmldb/LocalCollection.java</exclude>
<exclude>src/test/java/org/exist/xmldb/LocalCollectionTest.java</exclude>
<exclude>src/main/java/org/exist/xmldb/LocalCompiledExpression.java</exclude>
<exclude>src/main/java/org/exist/xmldb/LocalResourceSet.java</exclude>
<exclude>src/main/java/org/exist/xmldb/LocalRestoreService.java</exclude>
<exclude>src/main/java/org/exist/xmldb/LocalXMLResource.java</exclude>
Expand DownExpand Up@@ -2169,15 +2189,19 @@
<exclude>src/test/java/org/exist/xmldb/concurrent/action/ValueAppendAction.java</exclude>
<exclude>src/test/java/org/exist/xmldb/concurrent/action/XQueryAction.java</exclude>
<exclude>src/test/java/org/exist/xmldb/concurrent/action/XQueryUpdateAction.java</exclude>
<exclude>src/main/java/org/exist/xmlrpc/AbstractCachedResult.java</exclude>
<exclude>src/main/java/org/exist/xmlrpc/ACEAiderParser.java</exclude>
<exclude>src/main/java/org/exist/xmlrpc/ACEAiderSerializer.java</exclude>
<exclude>src/main/java/org/exist/xmlrpc/ArrayWrapperParser.java</exclude>
<exclude>src/main/java/org/exist/xmlrpc/ArrayWrapperSerializer.java</exclude>
<exclude>src/main/java/org/exist/xmlrpc/CachedQueryResult.java</exclude>
<exclude>src/main/java/org/exist/xmlrpc/ExistRpcTypeFactory.java</exclude>
<exclude>src/test/java/org/exist/xmlrpc/MimeTypeTest.java</exclude>
<exclude>src/main/java/org/exist/xmlrpc/QueryResultCache.java</exclude>
<exclude>src/test/java/org/exist/xmlrpc/QuerySessionTest.java</exclude>
<exclude>src/main/java/org/exist/xmlrpc/RpcAPI.java</exclude>
<exclude>src/main/java/org/exist/xmlrpc/RpcConnection.java</exclude>
<exclude>src/main/java/org/exist/xmlrpc/XmldbRequestProcessorFactory.java</exclude>
<exclude>src/main/java/org/exist/xmlrpc/XmlRpcExtensionConstants.java</exclude>
<exclude>src/test/java/org/exist/xmlrpc/XmlRpcTest.java</exclude>
<exclude>src/main/java/org/exist/xqj/Marshaller.java</exclude>
Expand All@@ -2192,6 +2216,7 @@
<exclude>src/test/java/org/exist/xquery/CardinalityTest.java</exclude>
<exclude>src/test/java/org/exist/xquery/CastExpressionTest.java</exclude>
<exclude>src/test/java/org/exist/xquery/CleanupTest.java</exclude>
<exclude>src/main/java/org/exist/xquery/CompiledXQuery.java</exclude>
<exclude>src/test/java/org/exist/xquery/ConstructedNodesRecoveryTest.java</exclude>
<exclude>src/test/java/org/exist/xquery/ConstructedNodesTest.java</exclude>
<exclude>src/main/java/org/exist/xquery/Context.java</exclude>
Expand DownExpand Up@@ -2242,6 +2267,9 @@
<exclude>src/test/java/org/exist/xquery/PersistentDescendantOrSelfNodeKindTest.java</exclude>
<exclude>src/test/java/org/exist/xquery/QueryPoolTest.java</exclude>
<exclude>src/test/java/org/exist/xquery/RestBinariesTest.java</exclude>
<exclude>src/test/java/org/exist/xquery/RunningXQueryRestTest.java</exclude>
<exclude>src/test/java/org/exist/xquery/RunningXQueryTest.java</exclude>
<exclude>src/test/java/org/exist/xquery/RunningXQueryXmlDbTest.java</exclude>
<exclude>src/test/java/org/exist/xquery/SeqOpTest.java</exclude>
<exclude>src/test/java/org/exist/xquery/SpecialNamesTest.java</exclude>
<exclude>src/test/java/org/exist/xquery/StoredModuleTest.java</exclude>
Expand DownExpand Up@@ -2430,6 +2458,7 @@
<exclude>src/test/java/org/exist/xquery/functions/util/Base64FunctionsTest.java</exclude>
<exclude>src/test/java/org/exist/xquery/functions/util/BaseConverterTest.java</exclude>
<exclude>src/main/java/org/exist/xquery/functions/util/BuiltinFunctions.java</exclude>
<exclude>src/main/java/org/exist/xquery/functions/util/CollectionName.java</exclude>
<exclude>src/main/java/org/exist/xquery/functions/util/DescribeFunction.java</exclude>
<exclude>src/main/java/org/exist/xquery/functions/util/Eval.java</exclude>
<exclude>src/test/java/org/exist/xquery/functions/util/EvalTest.java</exclude>
Expand DownExpand Up@@ -2721,6 +2750,13 @@ The original license statement is also included below.]]></preamble>
<includes>
<include>src/main/java/org/exist/mediatype/MediaTypeService.java</include>
<include>src/main/java/org/exist/mediatype/MediaTypeUtil.java</include>
<include>src/main/java/org/exist/security/internal/aider/ImmutableUnixStylePermissionAider.java</include>
<include>src/main/java/org/exist/source/DbStoreSource.java</include>
<include>src/main/java/org/exist/source/DbUriSource.java</include>
<include>src/main/java/org/exist/xmldb/LocalCompiledExpression.java</include>
<include>src/test/java/org/exist/xquery/RunningXQueryRestTest.java</include>
<include>src/test/java/org/exist/xquery/RunningXQueryTest.java</include>
<include>src/test/java/org/exist/xquery/RunningXQueryXmlDbTest.java</include>
<include>src/main/resources/xyz/elemental/mediatype/media-type-aliases.xml</include>
<include>src/main/resources/xyz/elemental/mediatype/media-type-mappings.xml</include>
<include>src/main/resources/xyz/elemental/mediatype/mime.types</include>
Expand DownExpand Up@@ -3050,4 +3086,4 @@ The BaseX Team. The original license statement is also included below.]]></pream
</profile>
</profiles>

</project>
</project>
6 changes: 3 additions & 3 deletions exist-core/src/main/java/org/exist/collections/triggers/XQueryTrigger.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,7 @@
import org.exist.dom.persistent.DocumentImpl;
import org.exist.dom.QName;
import org.exist.security.PermissionDeniedException;
import org.exist.source.DBSource;
import org.exist.source.DbStoreSource;
import org.exist.source.Source;
import org.exist.source.SourceFactory;
import org.exist.source.StringSource;
Expand DownExpand Up@@ -364,8 +364,8 @@ private CompiledXQuery getScript(final DBBroker broker, final Txn transaction) t
context.prepareForReuse();
}

if (query instanceof DBSource) {
context.setModuleLoadPath(XmldbURI.EMBEDDED_SERVER_URI_PREFIX + ((DBSource)query).getDocumentPath().removeLastSegment().toString());
if (query instanceof DbStoreSource) {
context.setModuleLoadPath(XmldbURI.EMBEDDED_SERVER_URI_PREFIX + ((DbStoreSource) query).getDocumentPath().removeLastSegment().toString());
}

//compile the XQuery
Expand Down
Loading
Loading