diff options
| -rw-r--r-- | src/rabbit_msg_file.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_msg_store.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_msg_store_gc.erl | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/rabbit_msg_file.erl b/src/rabbit_msg_file.erl index 51d875acaf..0bf702e41a 100644 --- a/src/rabbit_msg_file.erl +++ b/src/rabbit_msg_file.erl @@ -104,8 +104,7 @@ scan(FileHdl, FileSize, Data, ReadOffset, Acc, ScanOffset) -> {Data2, Acc1, ScanOffset1} = scan(<<Data/binary, Data1/binary>>, Acc, ScanOffset), ReadOffset1 = ReadOffset + size(Data1), - scan(FileHdl, FileSize, Data2, ReadOffset1, Acc1, - ScanOffset1); + scan(FileHdl, FileSize, Data2, ReadOffset1, Acc1, ScanOffset1); _KO -> {ok, Acc, ScanOffset} end. diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index 0f3f57a0f4..706a7fae70 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -1331,8 +1331,7 @@ scan_file_for_valid_messages(Dir, FileName) -> end. scan_file_for_valid_messages_and_guids(Dir, FileName) -> - {ok, Messages, _FileSize} = - scan_file_for_valid_messages(Dir, FileName), + {ok, Messages, _FileSize} = scan_file_for_valid_messages(Dir, FileName), {ok, Messages, [Guid || {Guid, _TotalSize, _FileOffset} <- Messages]}. %% Takes the list in *ascending* order (i.e. eldest message @@ -1680,8 +1679,7 @@ find_unremoved_messages_in_file(File, end, {[], 0}, Messages). copy_messages(WorkList, InitOffset, FinalOffset, SourceHdl, DestinationHdl, - Destination, - {_FileSummaryEts, _Dir, Index, IndexState}) -> + Destination, {_FileSummaryEts, _Dir, Index, IndexState}) -> Copy = fun ({BlockStart, BlockEnd}) -> BSize = BlockEnd - BlockStart, {ok, BlockStart} = diff --git a/src/rabbit_msg_store_gc.erl b/src/rabbit_msg_store_gc.erl index 56cd422b5b..4b80d088d7 100644 --- a/src/rabbit_msg_store_gc.erl +++ b/src/rabbit_msg_store_gc.erl @@ -68,8 +68,7 @@ start_link(Dir, IndexState, IndexModule, FileSummaryEts) -> gen_server2:start_link( - ?MODULE, - [self(), Dir, IndexState, IndexModule, FileSummaryEts], + ?MODULE, [self(), Dir, IndexState, IndexModule, FileSummaryEts], [{timeout, infinity}]). gc(Server, Source, Destination) -> |