Fix race condition in MapMerge duplicate handling under fork-join#2595
Merged
ChristianGruen merged 1 commit intoBaseXdb:mainfrom Feb 11, 2026
Merged
Fix race condition in MapMerge duplicate handling under fork-join#2595ChristianGruen merged 1 commit intoBaseXdb:mainfrom
MapMerge duplicate handling under fork-join#2595ChristianGruen merged 1 commit intoBaseXdb:mainfrom
Conversation
GuntherRademacher
added a commit
to GuntherRademacher/basex
that referenced
this pull request
Feb 11, 2026
ChristianGruen
pushed a commit
that referenced
this pull request
Feb 11, 2026
* fix race condition in `MapMerge` duplicate handling under `fork-join` * test cleanup
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR fixes a concurrency issue in
MapMergewhen a function is supplied as the duplicates option and the query runs viaxquery:fork-join. The duplicate handler was cached and captured aQueryContext, andInvokereused a mutableHofArgsinstance. Under parallel execution, this could corrupt combiner arguments and lead to sporadic errors such as:Changes:
QueryContextat call time instead of caching itInvokethread-safe by usingThreadLocal<HofArgs>Related to #2479.