#5786 - Identical layered spans not merging in curation mode#6004
Merged
reckart merged 2 commits intoMay 5, 2026
Merged
Conversation
There was a problem hiding this comment.
Pull request overview
This PR aims to fix curation auto-merge for layered spans by deferring constraint-driven hidden-feature clearing until all copied feature values have been applied, so feature order no longer changes the merge result.
Changes:
- Added a batched feature-update API on
TypeAdapter. - Implemented deferred hidden-feature clearing in
TypeAdapter_ImplBase. - Updated curation merge to use the batch API and added regression tests for the deferred-clearing behavior.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/TypeAdapter.java |
Adds the new batched feature-update entry point to the adapter SPI. |
inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/adapter/FeatureValueUpdateContext.java |
Introduces the closeable context used for grouped feature updates. |
inception/inception-layer-span/src/test/java/de/tudarmstadt/ukp/inception/annotation/layer/span/FeatureValueUpdateContextTest.java |
Adds regression tests for deferred hidden-feature clearing behavior. |
inception/inception-curation/src/main/java/de/tudarmstadt/ukp/inception/curation/merge/CasMerge.java |
Switches curation feature copying to the new batched update flow. |
inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/TypeAdapter_ImplBase.java |
Implements batched updates and centralizes feature-update event publishing. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
- Properly scope clearing of conditional features during auto-merge - Added tests
reckart
force-pushed
the
bugfix/5786-Identical-layered-spans-not-merging-in-curation-mode
branch
from
559028f to
d5bfa55
Compare
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
- Expand fix to other similar situations
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 12 out of 12 changed files in this pull request and generated 4 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
reckart
deleted the
bugfix/5786-Identical-layered-spans-not-merging-in-curation-mode
branch
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
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.
What's in the PR
How to test manually
Automatic testing
Documentation