Skip to content
This repository has been archived by the owner on Dec 15, 2022. It is now read-only.

Resolve conflicts during remote insertion integration in O(log n) #4

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Resolve conflicts during remote insertion integration in O(log n) #4

wants to merge 6 commits into from

Commits on Nov 12, 2017

  1. Use RGA's linear conflict resolution algorithm 

    ...and temporarily disable serialization.

Signed-off-by: Nathan Sobo <nathansobo@github.com>
Signed-off-by: Nathan Sobo <nathan@github.com>
    Antonio Scandurra authored and Nathan Sobo committed Nov 12, 2017
    Configuration menu
    Copy the full SHA
    be2d18f View commit details
    Browse the repository at this point in the history

  2. Make insertion conflict resolution O(log n)

    Antonio Scandurra committed Nov 12, 2017
    Configuration menu
    Copy the full SHA
    918872f View commit details
    Browse the repository at this point in the history

  3. Fix tests to reflect the new tie breaking rule based on highest site id

    Antonio Scandurra committed Nov 12, 2017
    Configuration menu
    Copy the full SHA
    cb926da View commit details
    Browse the repository at this point in the history

  4. Replace insertBetween with insertBefore in DocumentTree

    Antonio Scandurra committed Nov 12, 2017
    Configuration menu
    Copy the full SHA
    89cafc2 View commit details
    Browse the repository at this point in the history

  5. Serialize insertionClock and re-enable serialization tests

    Antonio Scandurra committed Nov 12, 2017
    Configuration menu
    Copy the full SHA
    7ad3752 View commit details
    Browse the repository at this point in the history

  6. Delete unused getPredecessor method

    Antonio Scandurra committed Nov 12, 2017
    Configuration menu
    Copy the full SHA
    442c379 View commit details
    Browse the repository at this point in the history