umgeher/leveled
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Address confusion over type in DeletionsList

Browse source
This commit is contained in:
martinsumner 2017-01-17 10:21:29 +00:00
parent c32fd3fb4c
commit 59dc451e70
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/leveled_pclerk.erl
View file

@ -181,6 +181,7 @@ perform_merge(Manifest, Src, SinkList, SrcLevel, RootPath, NewSQN) ->
fun({next, ME, _SK}) -> fun({next, ME, _SK}) ->
ME ME
end, end,
SinkManifestList = lists:map(RevertPointerFun, SinkList),
Man0 = leveled_manifest:insert_manifest_entry(Manifest, Man0 = leveled_manifest:insert_manifest_entry(Manifest,
NewSQN, NewSQN,
SinkLevel, SinkLevel,
@ -188,13 +189,12 @@ perform_merge(Manifest, Src, SinkList, SrcLevel, RootPath, NewSQN) ->
Man1 = leveled_manifest:remove_manifest_entry(Man0, Man1 = leveled_manifest:remove_manifest_entry(Man0,
NewSQN, NewSQN,
SinkLevel, SinkLevel,
lists:map(RevertPointerFun, SinkManifestList),
SinkList)),
Man2 = leveled_manifest:remove_manifest_entry(Man1, Man2 = leveled_manifest:remove_manifest_entry(Man1,
NewSQN, NewSQN,
SrcLevel, SrcLevel,
Src), Src),
{Man2, [Src|SinkList]}. {Man2, [Src|SinkManifestList]}.
do_merge([], [], SinkLevel, _SinkB, _RP, NewSQN, _MaxSQN, Additions) -> do_merge([], [], SinkLevel, _SinkB, _RP, NewSQN, _MaxSQN, Additions) ->
leveled_log:log("PC011", [NewSQN, SinkLevel, length(Additions)]), leveled_log:log("PC011", [NewSQN, SinkLevel, length(Additions)]),