[jira] [Resolved] (OAK-3586) ConflictException and CommitQueue should support a list of revisions

["Marcel Reutegger (JIRA)" <ji...@apache.org>]

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

Marcel Reutegger resolved OAK-3586.
-----------------------------------
       Resolution: Fixed
    Fix Version/s:     (was: 1.4)
                   1.3.13

Thanks for the patch.

I committed it with minor changes:

- Reverted back to IdentityHashMap for suspendedCommits. I didn't see a reason why your change to HashMap was needed.
- Changed the check in ConflictException.asCommitFailedException() since conflictRevisions is never null
- Increased join timeout to 1000 ms in CommitQueueTest.concurrentSuspendUntil(). 10 ms may be a bit low for slower environments.

Committed to trunk: http://svn.apache.org/r1718544

> ConflictException and CommitQueue should support a list of revisions
> --------------------------------------------------------------------
>
>                 Key: OAK-3586
>                 URL: https://issues.apache.org/jira/browse/OAK-3586
>             Project: Jackrabbit Oak
>          Issue Type: Technical task
>          Components: core, documentmk
>            Reporter: Tomek Rękawek
>            Assignee: Marcel Reutegger
>             Fix For: 1.3.13
>
>         Attachments: OAK-3586.patch
>
>
> The OAK-3559 aims at providing bulk version of the {{DocumentStore#createOrUpdate()}}, so the {{Commit}} class can apply many changes at the same time. If there's a conflict detected afterwards, it may involve many documents and revisions. That's why the {{ConflictException}} needs to be extended, so it can contain a revision list rather than a single revision.
> Once the {{ConflictException}} contains revision list, the {{CommitQueue#suspendUntil()}} method should be updated as well, to suspend thread until all revisions from the passed collection are visible and all conflicts are resolved.



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