iilyak commented on a change in pull request #3766:
URL: https://github.com/apache/couchdb/pull/3766#discussion_r761102470
##########
File path: src/smoosh/src/smoosh_channel.erl
##########
@@ -194,21 +204,116 @@ handle_info(check_window, State0) ->
end,
erlang:send_after(60 * 1000, self(), check_window),
{noreply, FinalState};
+
+handle_info(persist_queue, State0) ->
+ #state{waiting=Queue} = State0,
+ write_state_to_file(State0),
+ smoosh_priority_queue:write_to_file(Queue),
+ Checkpoint = config:get_integer("smoosh",
"state_checkpoint_interval_in_sec", ?DEFAULT_CHECKPOINT_INTERVAL_IN_SEC) * 1000,
+ erlang:send_after(Checkpoint, self(), persist_queue),
+ {noreply, State0};
+
handle_info(pause, State0) ->
- {ok, State} = code_change(nil, State0, nil),
- {noreply, State#state{paused = true}};
+ State = maybe_open_queue(State0),
+ {noreply, State#state{paused=true}};
handle_info(unpause, State0) ->
- {ok, State} = code_change(nil, State0, nil),
- {noreply, maybe_start_compaction(State#state{paused = false})}.
+ State = maybe_open_queue(State0),
+ {noreply, maybe_start_compaction(State#state{paused=false})}.
-terminate(_Reason, _State) ->
+terminate(_Reason, #state{name=Name, waiting = Q}) ->
+ file:delete(active_file_name(Name)),
+ file:delete(starting_file_name(Name)),
+ if Q =/= nil ->
+ smoosh_priority_queue:close(Q);
+ true ->
+ nil
+ end,
ok.
-code_change(_OldVsn, #state{} = State, _Extra) ->
- {ok, State}.
+maybe_recover_state(#state{name=Name} = State) ->
+ Active = recover(active_file_name(Name)),
+ Starting = recover(starting_file_name(Name)),
+ DatabaseDir = config:get("couchdb", "database_dir"),
+ ViewDir = config:get("couchdb", "view_index_dir"),
+ Active1 = get_matching_compact_files(DatabaseDir, Active),
+ Active2 = get_matching_compact_files(ViewDir, Active),
+ Active3 = Active1 ++ Active2,
+ State#state{active=Active3, starting=Starting}.
+
+get_matching_compact_files(Dir, Active) ->
+ filelib:fold_files(Dir, "^[a-zA-Z0-9_.-]*.compact$", true, (fun(FilePath,
Acc) ->
+ FilePrefix = lists:nth(1, string:split(FilePath, ".compact")),
+ case lists:keyfind(FilePrefix, 1, Active) of
+ false ->
+ Acc;
+ Tuple ->
+ Acc ++ [Tuple]
Review comment:
This is slow in erlang. It is usually faster to do `[Tuple | Acc]` and
reverse list at the end (if order is important). How many elements do you
anticipate in Active?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
