jackrabbit-oak-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Michael Dürig (JIRA) <j...@apache.org>
Subject [jira] [Commented] (OAK-535) MergeCommand reads complete tree into memory
Date Tue, 29 Jan 2013 16:43:12 GMT

    [ https://issues.apache.org/jira/browse/OAK-535?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13565505#comment-13565505
] 

Michael Dürig commented on OAK-535:
-----------------------------------

bq. some tests fail, because they expect a MK implementation will consider concurrent sibling
creation as non-conflicting.

... and {{getNonConflictingCommitsDiff()}} considers these as conflicting right? This is the
same finding [Mete reported earlier|https://issues.apache.org/jira/browse/OAK-585?focusedCommentId=13564137&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13564137].


I think we need to put some effort into defining what we consider a conflict and what not.
[Here | http://wiki.apache.org/jackrabbit/Conflict%20handling%20through%20rebasing%20branches]
(towards the end of the page) is the definition I use for rebasing. It is based on the expectations
of oak-core and ultimately JCR. Specifically note the delete-delete conflicts. Those would
be easy to resolve. However the JCR TCK mandates these to be conflicts. See {{org.apache.jackrabbit.test.api.NodeTest#testRemoveInvalidItemStateException}}.
                
> MergeCommand reads complete tree into memory
> --------------------------------------------
>
>                 Key: OAK-535
>                 URL: https://issues.apache.org/jira/browse/OAK-535
>             Project: Jackrabbit Oak
>          Issue Type: Bug
>          Components: mongomk
>    Affects Versions: 0.5
>            Reporter: Marcel Reutegger
>            Assignee: Marcel Reutegger
>         Attachments: FailFastMergeCommand.patch, mergecommandoptimization.patch, mergefixattempt.patch,
movepatch.diff, moves-in-commit.patch, OAK-535.patch
>
>
> Merging commits to a branch back to head in MongoMK calls MergeCommand, which reads the
complete tree into memory. The more content is in the repository, the longer it takes to store
even a simple update as a property change.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

Mime
View raw message