[
https://issues.apache.org/jira/browse/OAK-8623?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16937708#comment-16937708
]
Marcel Reutegger commented on OAK-8623:
---------------------------------------
Thanks for the review. I agree it would be better to clean up changes from
branch commits that have not been merged. This will be a bigger change and in
my view should go into the revision garbage collection. I created a separate
issue for that: OAK-8646
> Improve collision handling performance
> --------------------------------------
>
> Key: OAK-8623
> URL: https://issues.apache.org/jira/browse/OAK-8623
> Project: Jackrabbit Oak
> Issue Type: Improvement
> Components: documentmk
> Reporter: Marcel Reutegger
> Assignee: Marcel Reutegger
> Priority: Major
> Attachments: OAK-8623.patch
>
>
> The current collision handling on conflict in the DocumentNodeStore can be
> rather expensive when there are old branch commits which were not merged.
> A commit that includes documents with old branch commits that have not been
> merged will always attempt to set a collision marker on the commit root
> document for those changes.
> While it is difficult to tell whether a branch commit will be merged at some
> point, at least those branch commits that were created before the most recent
> startup of a cluster node cannot be merged. The collision handling logic
> could be improved to take the start time of a cluster node into account.
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
