[jira] [Updated] (OAK-2673) Resolve add-add, delete-delete merge conflict for empty hidden docs

["Vikas Saurabh (JIRA)" <ji...@apache.org>]

     [ https://issues.apache.org/jira/browse/OAK-2673?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Vikas Saurabh updated OAK-2673:
-------------------------------
    Attachment: OAK-2673-HiddenNodeSameNameMergeConflict.patch

Attaching a [patch|^OAK-2673-HiddenNodeSameNameMergeConflict.patch] which adds quite a few tests cases for 2 node scenario merge conflict and for case where single instance conflicts happen.
Some test cases assert that same name conflict for non-hidden or non-empty nodes should _fail_. I'm not sure if the test case should instead be inverted and ignored instead.

About the fix: The change is mostly in {{DocumentNode.isConflicting}} which gives a bit of lee way to empty hidden nodes. For now, I've just used that method in cases in {{Commit.checkConflicts}}... I think those 2 methods are meant to be unified sooner or later.

> Resolve add-add, delete-delete merge conflict for empty hidden docs
> -------------------------------------------------------------------
>
>                 Key: OAK-2673
>                 URL: https://issues.apache.org/jira/browse/OAK-2673
>             Project: Jackrabbit Oak
>          Issue Type: Sub-task
>          Components: mongomk
>            Reporter: Vikas Saurabh
>             Fix For: 1.4
>
>         Attachments: OAK-2673-HiddenNodeSameNameMergeConflict.patch
>
>
> While OAK-1550 is about general fix for resolving same node merge conflicts. But until general issue is fixed, we should special case for hidden nodes (e.g. index sub-tree).



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)