diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2017-02-23 17:22:20 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2017-02-23 17:22:20 +0000 |
| commit | 2dc2547323e2b720cb8973c68652d318555c42c0 (patch) | |
| tree | f283bd7d4197ec43e6433d854bede326297de570 /src | |
| parent | a8997349d1affc03e72c98bab1200463a2aa0569 (diff) | |
| download | rabbitmq-server-git-2dc2547323e2b720cb8973c68652d318555c42c0.tar.gz | |
Long ugly callback name
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_msg_store.erl | 9 | ||||
| -rw-r--r-- | src/rabbit_msg_store_ets_index.erl | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index 4fa9ac26cf..52d0b5f0fc 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -1537,9 +1537,10 @@ index_update_fields(Key, Updates, #msstate { index_module = Index, index_delete(Key, #msstate { index_module = Index, index_state = State }) -> Index:delete(Key, State). -index_cleanup_undefined_file(#msstate { index_module = Index, - index_state = State }) -> - Index:cleanup_undefined_file(State). +index_clean_up_temporary_reference_count_entries( + #msstate { index_module = Index, + index_state = State }) -> + Index:clean_up_temporary_reference_count_entries_without_file(State). %%---------------------------------------------------------------------------- %% shutdown and recovery @@ -1730,7 +1731,7 @@ build_index(Gatherer, Left, [], empty -> unlink(Gatherer), ok = gatherer:stop(Gatherer), - ok = index_cleanup_undefined_file(State), + ok = index_clean_up_temporary_reference_count_entries(State), Offset = case ets:lookup(FileSummaryEts, Left) of [] -> 0; [#file_summary { file_size = FileSize }] -> FileSize diff --git a/src/rabbit_msg_store_ets_index.erl b/src/rabbit_msg_store_ets_index.erl index 4195be4fe9..1faf3bff14 100644 --- a/src/rabbit_msg_store_ets_index.erl +++ b/src/rabbit_msg_store_ets_index.erl @@ -22,7 +22,7 @@ -export([new/1, recover/1, lookup/2, insert/2, update/2, update_fields/3, delete/2, - delete_object/2, cleanup_undefined_file/1, terminate/1]). + delete_object/2, clean_up_temporary_reference_count_entries_without_file/1, terminate/1]). -define(MSG_LOC_NAME, rabbit_msg_store_ets_index). -define(FILENAME, "msg_store_index.ets"). @@ -68,7 +68,7 @@ delete_object(Obj, State) -> true = ets:delete_object(State #state.table, Obj), ok. -cleanup_undefined_file(State) -> +clean_up_temporary_reference_count_entries_without_file(State) -> MatchHead = #msg_location { file = undefined, _ = '_' }, ets:select_delete(State #state.table, [{MatchHead, [], [true]}]), ok. |