feat: conflict resolution for DataReplacement#3631
Merged
wjones127 merged 4 commits intolance-format:mainfrom Nov 15, 2025
Merged
feat: conflict resolution for DataReplacement#3631wjones127 merged 4 commits intolance-format:mainfrom
wjones127 merged 4 commits intolance-format:mainfrom
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3631 +/- ##
==========================================
+ Coverage 81.98% 82.28% +0.29%
==========================================
Files 341 344 +3
Lines 141199 144918 +3719
Branches 141199 144918 +3719
==========================================
+ Hits 115758 119240 +3482
- Misses 21628 21753 +125
- Partials 3813 3925 +112
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Contributor
chebbyChefNEQ
left a comment
chebbyChefNEQ
left a comment
There was a problem hiding this comment.
Just two comments on even finer conflict detection. Every thing else look great!
wjones127
force-pushed
the
feat/data-replacement-conflict-res
branch
from
9644f5c to
69829ed
Compare
Closes lance-format#3686 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
…x conflicts Previously, conflict detection between DataReplacement and CreateIndex only checked if the fields overlapped. Now also checks if the indexed fragment bitmap contains the fragment ID being replaced, providing more granular conflict detection. When an index has no fragment_bitmap (None), we conservatively assume conflict to maintain safety. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
wjones127
force-pushed
the
feat/data-replacement-conflict-res
branch
from
03b05ab to
55b80f9
Compare
jackye1995
pushed a commit
to jackye1995/lance
that referenced
this pull request
Jan 21, 2026
Closes [lance-format#3686](lancedb/sophon#3686) --------- Co-authored-by: Claude <noreply@anthropic.com>
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
4 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.
Closes #3686