[
https://issues.apache.org/jira/browse/OAK-1945?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Jukka Zitting resolved OAK-1945.
--------------------------------
Resolution: Fixed
Fix Version/s: 1.1
Assignee: Jukka Zitting
I updated the {{merge()}} javadocs in revision 1608528. The updated javadoc
states:
{noformat}
* Merges the changes between the
* {@link NodeBuilder#getBaseState() base} and
* {@link NodeBuilder#getNodeState() head} states
* of the given builder to this store.
{noformat}
> Unclear NodeStore.merge() contract
> ----------------------------------
>
> Key: OAK-1945
> URL: https://issues.apache.org/jira/browse/OAK-1945
> Project: Jackrabbit Oak
> Issue Type: Improvement
> Components: core
> Reporter: Alex Parvulescu
> Assignee: Jukka Zitting
> Fix For: 1.1
>
> Attachments: MergeTest.java.patch
>
>
> The SegmentMK doesn't respect the #merge contract when there is a builder
> that has no local changes passed in.
> This popped-up while I was reworking the restore parts and with the new
> compaction code, the only option is to pass in a NodeState#Builder builder
> which is considered by the #merge method as a noop and therefore ignored.
> (update: See comments below)
--
This message was sent by Atlassian JIRA
(v6.2#6252)
