diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_msg_store.erl | 18 | ||||
| -rw-r--r-- | src/rabbit_msg_store_gc.erl | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index 05fd1741a7..0666228f1e 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -38,7 +38,7 @@ write/4, read/3, contains/2, remove/2, release/2, sync/3]). -export([sync/1, gc_done/4, set_maximum_since_use/2, - gc/3, delete_file/2, has_readers/2]). %% internal + combine/3, delete_file/2, has_readers/2]). %% internal -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3, prioritise_call/3, prioritise_cast/2]). @@ -157,8 +157,8 @@ -spec(gc_done/4 :: (server(), non_neg_integer(), file_num(), file_num()) -> 'ok'). -spec(set_maximum_since_use/2 :: (server(), non_neg_integer()) -> 'ok'). --spec(gc/3 :: (non_neg_integer(), non_neg_integer(), gc_state()) -> - non_neg_integer()). +-spec(combine/3 :: (non_neg_integer(), non_neg_integer(), gc_state()) -> + non_neg_integer()). -spec(delete_file/2 :: (non_neg_integer(), gc_state()) -> 'ok'). -spec(has_readers/2 :: (non_neg_integer(), gc_state()) -> boolean()). @@ -1464,8 +1464,8 @@ maybe_compact(State = #msstate { sum_valid_data = SumValid, '$end_of_table' -> State; First -> - case find_files_to_gc(FileSummaryEts, FileSizeLimit, - ets:lookup(FileSummaryEts, First)) of + case find_files_to_combine(FileSummaryEts, FileSizeLimit, + ets:lookup(FileSummaryEts, First)) of not_found -> State; {Src, Dst} -> @@ -1474,14 +1474,14 @@ maybe_compact(State = #msstate { sum_valid_data = SumValid, {#file_summary.locked, true}), true = ets:update_element(FileSummaryEts, Dst, {#file_summary.locked, true}), - ok = rabbit_msg_store_gc:gc(GCPid, Src, Dst), + ok = rabbit_msg_store_gc:combine(GCPid, Src, Dst), State1 #msstate { gc_active = {Src, Dst} } end end; maybe_compact(State) -> State. -find_files_to_gc(FileSummaryEts, FileSizeLimit, +find_files_to_combine(FileSummaryEts, FileSizeLimit, [#file_summary { file = Dst, valid_total_size = DstValid, right = Src, @@ -1502,7 +1502,7 @@ find_files_to_gc(FileSummaryEts, FileSizeLimit, (DstValid > 0) andalso (SrcValid > 0) andalso not (DstLocked orelse SrcLocked) of true -> {Src, Dst}; - false -> find_files_to_gc( + false -> find_files_to_combine( FileSummaryEts, FileSizeLimit, Next) end end @@ -1565,7 +1565,7 @@ delete_file(File, State = #gc_state { file_summary_ets = FileSummaryEts, true = ets:delete(FileSummaryEts, File), ok = file:delete(form_filename(Dir, filenum_to_name(File))). -gc(SrcFile, DstFile, State = #gc_state { file_summary_ets = FileSummaryEts }) -> +combine(SrcFile, DstFile, State = #gc_state { file_summary_ets = FileSummaryEts }) -> [SrcObj = #file_summary { readers = 0, left = DstFile, diff --git a/src/rabbit_msg_store_gc.erl b/src/rabbit_msg_store_gc.erl index 008de53508..83924fb4a3 100644 --- a/src/rabbit_msg_store_gc.erl +++ b/src/rabbit_msg_store_gc.erl @@ -33,7 +33,7 @@ -behaviour(gen_server2). --export([start_link/1, gc/3, delete/2, no_readers/2, stop/1]). +-export([start_link/1, combine/3, delete/2, no_readers/2, stop/1]). -export([set_maximum_since_use/2]). @@ -54,7 +54,7 @@ -spec(start_link/1 :: (rabbit_msg_store:gc_state()) -> rabbit_types:ok_pid_or_error()). --spec(gc/3 :: (pid(), non_neg_integer(), non_neg_integer()) -> 'ok'). +-spec(combine/3 :: (pid(), non_neg_integer(), non_neg_integer()) -> 'ok'). -spec(delete/2 :: (pid(), non_neg_integer()) -> 'ok'). -spec(no_readers/2 :: (pid(), non_neg_integer()) -> 'ok'). -spec(stop/1 :: (pid()) -> 'ok'). @@ -68,8 +68,8 @@ start_link(MsgStoreState) -> gen_server2:start_link(?MODULE, [self(), MsgStoreState], [{timeout, infinity}]). -gc(Server, Source, Destination) -> - gen_server2:cast(Server, {gc, [Source, Destination]}). +combine(Server, Source, Destination) -> + gen_server2:cast(Server, {combine, [Source, Destination]}). delete(Server, File) -> gen_server2:cast(Server, {delete, [File]}). @@ -100,7 +100,7 @@ handle_call(stop, _From, State) -> {stop, normal, ok, State}. handle_cast({Action, Files}, State) - when is_list(Files) andalso (Action =:= gc orelse Action =:= delete) -> + when is_list(Files) andalso (Action =:= combine orelse Action =:= delete) -> {noreply, attempt_action(Action, Files, State), hibernate}; handle_cast({no_readers, File}, @@ -141,10 +141,10 @@ attempt_action(Action, Files, dict:store(File, {Action, Files}, Pending) } end. -do_action(gc, [Source, Destination], - State = #state { parent = Parent, - msg_store_state = MsgStoreState }) -> - Reclaimed = rabbit_msg_store:gc(Source, Destination, MsgStoreState), +do_action(combine, [Source, Destination], + State = #state { parent = Parent, + msg_store_state = MsgStoreState }) -> + Reclaimed = rabbit_msg_store:combine(Source, Destination, MsgStoreState), ok = rabbit_msg_store:gc_done(Parent, Reclaimed, Source, Destination), State; do_action(delete, [File], State = #state { msg_store_state = MsgStoreState }) -> |