diff options
| author | Michael Klishin <michael@novemberain.com> | 2017-02-23 20:36:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-23 20:36:10 +0300 |
| commit | 9b2d2af672b8075bbdff9a38347b71a2cd0f609f (patch) | |
| tree | 456df0bcb2e1c320698ad0e16f0a75435d690dc8 /src | |
| parent | afc851a40c80862a90e95a1b54196173f3629feb (diff) | |
| parent | 2dc2547323e2b720cb8973c68652d318555c42c0 (diff) | |
| download | rabbitmq-server-git-9b2d2af672b8075bbdff9a38347b71a2cd0f609f.tar.gz | |
Merge pull request #1123 from rabbitmq/rabbitmq-server-838
Rename msg_store_index:delete_by_file to index_cleanup_undefined_file
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_msg_store.erl | 9 | ||||
| -rw-r--r-- | src/rabbit_msg_store_ets_index.erl | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index d5c0031944..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_delete_by_file(File, #msstate { index_module = Index, - index_state = State }) -> - Index:delete_by_file(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_delete_by_file(undefined, 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 0e8b7174e2..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, delete_by_file/2, 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,8 +68,8 @@ delete_object(Obj, State) -> true = ets:delete_object(State #state.table, Obj), ok. -delete_by_file(File, State) -> - MatchHead = #msg_location { file = File, _ = '_' }, +clean_up_temporary_reference_count_entries_without_file(State) -> + MatchHead = #msg_location { file = undefined, _ = '_' }, ets:select_delete(State #state.table, [{MatchHead, [], [true]}]), ok. |