fix: resolve conflict scan origins to the item that contains them - #61
Open
iasakura wants to merge 1 commit into
Open
fix: resolve conflict scan origins to the item that contains them#61iasakura wants to merge 1 commit into
iasakura wants to merge 1 commit into
Conversation
|
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #61 +/- ##
===========================================
+ Coverage 15.29% 78.97% +63.68%
===========================================
Files 1 59 +58
Lines 582 10841 +10259
===========================================
+ Hits 89 8562 +8473
- Misses 493 2279 +1786
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
iasakura
force-pushed
the
fix/conflict-scan-run-granularity
branch
from
July 29, 2026 18:26
3cca291 to
cab1585
Compare
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.
The set membership tests in
find_conflict_leftalways failed when the id being looked up pointed to an element other than the first one of its item. Astest_insert_beside_multi_element_item_convergesshows, when anorigin_left_idpoints to such an element the scan can return a wrong insertion point, and replicas diverge depending on the order the updates were applied in.This PR looks up the id of the item holding that id before testing membership. The lookup needs the client's node list, which this function does not have, so it comes in as the
head_ofparameter:DocStorepassesget_node_indexandread::resolvepasseslocate.The loop also stops in a different place than yjs and yrs: where both of them break out, this scan keeps walking. Although that does not look like it affects convergence, I changed it to match yjs and yrs, as it only adds iterations with no benefit.