greg/hanoidb
1
0
Fork 0
Code Issues 10 Pull requests 3 Projects Releases Packages Wiki Activity

Send step_done when merge ends also

Browse source 
… just to be nice, we'd get the {'DOWN', ...}
anyway
This commit is contained in:
Kresten Krab Thorup 2012-04-23 04:55:10 +02:00
parent 25b4099eec
commit a1c8bb40bd
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/hanoi_merger.erl
View file

@ -133,11 +133,17 @@ scan(BT1, BT2, Out, IsLastLevel, [{Key1,Value1}|AT]=AKVs, [{Key2,Value2}|BT]=BKV
scan(BT1, BT2, Out2, IsLastLevel, AT, BT, Count+1, step(Step)) scan(BT1, BT2, Out2, IsLastLevel, AT, BT, Count+1, step(Step))
end. end.
scan_only(BT, Out, IsLastLevel, [], Count, Step) -> scan_only(BT, Out, IsLastLevel, [], Count, {_, FromPID}=Step) ->
case hanoi_reader:next_node(BT) of case hanoi_reader:next_node(BT) of
{node, KVs} -> {node, KVs} ->
scan_only(BT, Out, IsLastLevel, KVs, Count, step(Step)); scan_only(BT, Out, IsLastLevel, KVs, Count, step(Step));
end_of_data -> end_of_data ->
case FromPID of
none ->
ok;
{PID, Ref} ->
PID ! {Ref, step_done}
end,
{ok, Count, Out} {ok, Count, Out}
end; end;