Generate correct TreeChange in concurrent edits #712
Merged
Conversation
This file contains 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
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #712 +/- ##
==========================================
+ Coverage 81.75% 81.99% +0.23%
==========================================
Files 57 57
Lines 4161 4231 +70
Branches 805 828 +23
==========================================
+ Hits 3402 3469 +67
- Misses 502 503 +1
- Partials 257 259 +2 ☔ View full report in Codecov by Sentry. |
sejongk
commented
Jan 4, 2024
sejongk
force-pushed
the
generate-correct-tree-change
branch
from
ef3d6e2
to
452924e
Compare
hackerwins
force-pushed
the
generate-correct-tree-change
branch
from
7554aef
to
7738777
Compare
hackerwins
approved these changes
Jan 5, 2024
hackerwins
added a commit
to yorkie-team/yorkie
that referenced
this pull request
Jan 5, 2024
Unlike JS SDK, this PR doesn't create TreeChanges, but it changes the traversal logic to be token-based to keep consistency. Changes: - Implements token traversal method. - Ensures accurate inclusion of tokens (Start/End/Text) in ranges. Related to yorkie-team/yorkie-js-sdk#712 --------- Co-authored-by: Youngteac Hong <susukang98@gmail.com>
|
To be specific, compared to the implementation of the previous linked list, the traversal method is now token-based. |
2 tasks
2 tasks
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 this PR does / why we need it?
This PR introduces the logic for generating correct TreeChange in concurrent edits.
The main functionalities are collecting nodes to be deleted and creating ranges by accumulating successive nodes in pre-order.
Any background context you want to provide?
Unlike the
TextCRDT,Treehas levels and an element node has tags (Opening/Closing).For multi-level
Treeoperations (e.g. merge), the determination of which tag is included is currently important. However, using the existing post-order traversal, it is hard to determine if two nodes are successive and if which tags of the node are included in the range.As a result, This PR introduces a new traversal method that visits all kinds of tag, which include
Opening,Closing, andText.Alternatives for optimization
Optimizing by using the linked list (
prevandnextpointers) may be possible, but how to manage the links from theClosingtag and to theClosingtag should be considered.Like the
TextCRDT, generating ranges using undeleted nodes for optimization may be also feasible, but this is likely to require to traverse tombstones.traverseInTreePoslogic to traverse tombstones as well, and generate ranges using undeleted nodesWhat are the relevant tickets?
Fixes yorkie-team/yorkie#732
Checklist