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

Merge pull request #10 from yamt/fixes

Browse source 
Fixes issue with long running range fold 
introduced in f324972cdd
This commit is contained in:
Kresten Krab Thorup 2012-09-12 03:00:24 -07:00
commit f34f2c5ec2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/hanoidb_level.erl
View file

@ -439,10 +439,10 @@ main_loop(State = #state{ next=Next }) ->
?log("init_range_fold ~p -> ~p", [Range, WorkerPID]), ?log("init_range_fold ~p -> ~p", [Range, WorkerPID]),
{FoldingPIDs, NextList} = {NextList, FoldingPIDs} =
case {State#state.a, State#state.b, State#state.c} of case {State#state.a, State#state.b, State#state.c} of
{undefined, undefined, undefined} -> {undefined, undefined, undefined} ->
{[], List}; {List, []};
{_, undefined, undefined} -> {_, undefined, undefined} ->
ok = file:make_link(filename("A", State), filename("AF", State)), ok = file:make_link(filename("A", State), filename("AF", State)),
@ -821,7 +821,7 @@ start_range_fold(FileName, WorkerPID, Range, State) ->
Owner = self(), Owner = self(),
PID = proc_lib:spawn( fun() -> PID = proc_lib:spawn( fun() ->
try try
?log("start_range_fold ~p on ~p -> ~p", [self, FileName, WorkerPID]), ?log("start_range_fold ~p on ~p -> ~p", [self(), FileName, WorkerPID]),
erlang:link(WorkerPID), erlang:link(WorkerPID),
{ok, File} = hanoidb_reader:open(FileName, [folding|State#state.opts]), {ok, File} = hanoidb_reader:open(FileName, [folding|State#state.opts]),
do_range_fold2(File, WorkerPID, self(), Range), do_range_fold2(File, WorkerPID, self(), Range),