diff options
author | Emile Joubert <emile@rabbitmq.com> | 2011-02-11 17:56:09 +0000 |
---|---|---|
committer | Emile Joubert <emile@rabbitmq.com> | 2011-02-11 17:56:09 +0000 |
commit | a62685c1495b2e95f2e127ab607ec1634a18cc62 (patch) | |
tree | 008cc6b69cefe7f031f9be72570d322d40bdb1d5 | |
parent | 131e0bcdad6b6ecaa82ae807ec033a289c937179 (diff) | |
download | rabbitmq-server-a62685c1495b2e95f2e127ab607ec1634a18cc62.tar.gz |
Remove rabbit_msg_file:scan/2
-rw-r--r-- | src/rabbit_msg_file.erl | 11 | ||||
-rw-r--r-- | src/rabbit_msg_store.erl | 6 |
2 files changed, 6 insertions, 11 deletions
diff --git a/src/rabbit_msg_file.erl b/src/rabbit_msg_file.erl index 9d5953d5..81f2f07e 100644 --- a/src/rabbit_msg_file.erl +++ b/src/rabbit_msg_file.erl @@ -16,7 +16,7 @@ -module(rabbit_msg_file). --export([append/3, read/2, scan/2, scan/4]). +-export([append/3, read/2, scan/4]). %%---------------------------------------------------------------------------- @@ -45,9 +45,6 @@ -spec(read/2 :: (io_device(), msg_size()) -> rabbit_types:ok_or_error2({rabbit_guid:guid(), msg()}, any())). --spec(scan/2 :: (io_device(), file_size()) -> - {'ok', [{rabbit_guid:guid(), msg_size(), position()}], - position()}). -spec(scan/4 :: (io_device(), file_size(), fun (({rabbit_guid:guid(), msg_size(), position(), binary()}, A) -> A), A) -> {'ok', A, position()}). @@ -82,12 +79,6 @@ read(FileHdl, TotalSize) -> KO -> KO end. -scan_fun({Guid, TotalSize, Offset, _Msg}, Acc) -> - [{Guid, TotalSize, Offset} | Acc]. - -scan(FileHdl, FileSize) when FileSize >= 0 -> - scan(FileHdl, FileSize, <<>>, 0, [], 0, fun scan_fun/2). - scan(FileHdl, FileSize, Fun, Acc) when FileSize >= 0 -> scan(FileHdl, FileSize, <<>>, 0, Acc, 0, Fun). diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index b827eba9..82fb1735 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -1530,7 +1530,8 @@ scan_file_for_valid_messages(Dir, FileName) -> case open_file(Dir, FileName, ?READ_MODE) of {ok, Hdl} -> Valid = rabbit_msg_file:scan( Hdl, filelib:file_size( - form_filename(Dir, FileName))), + form_filename(Dir, FileName)), + fun scan_fun/2, []), %% if something really bad has happened, %% the close could fail, but ignore file_handle_cache:close(Hdl), @@ -1539,6 +1540,9 @@ scan_file_for_valid_messages(Dir, FileName) -> {error, Reason} -> {error, {unable_to_scan_file, FileName, Reason}} end. +scan_fun({Guid, TotalSize, Offset, _Msg}, Acc) -> + [{Guid, TotalSize, Offset} | Acc]. + %% Takes the list in *ascending* order (i.e. eldest message %% first). This is the opposite of what scan_file_for_valid_messages %% produces. The list of msgs that is produced is youngest first. |