diff options
| -rw-r--r-- | include/rabbit_msg_store.hrl | 2 | ||||
| -rw-r--r-- | src/rabbit_msg_file.erl | 8 | ||||
| -rw-r--r-- | src/rabbit_msg_store.erl | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/rabbit_msg_store.hrl b/include/rabbit_msg_store.hrl index a392a6f4ba..73eb4ae0e1 100644 --- a/include/rabbit_msg_store.hrl +++ b/include/rabbit_msg_store.hrl @@ -31,6 +31,8 @@ -include("rabbit.hrl"). +-define(FILE_SIZE_LIMIT, (16*1024*1024)). + -ifdef(use_specs). -type(msg() :: any()). diff --git a/src/rabbit_msg_file.erl b/src/rabbit_msg_file.erl index 0391090231..f758c184a2 100644 --- a/src/rabbit_msg_file.erl +++ b/src/rabbit_msg_file.erl @@ -35,6 +35,8 @@ %%---------------------------------------------------------------------------- +-include("rabbit_msg_store.hrl"). + -define(INTEGER_SIZE_BYTES, 8). -define(INTEGER_SIZE_BITS, (8 * ?INTEGER_SIZE_BYTES)). -define(WRITE_OK_SIZE_BITS, 8). @@ -43,12 +45,10 @@ -define(GUID_SIZE_BYTES, 16). -define(GUID_SIZE_BITS, (8 * ?GUID_SIZE_BYTES)). -define(SIZE_AND_GUID_BYTES, (?GUID_SIZE_BYTES + ?INTEGER_SIZE_BYTES)). --define(FOUR_MEGA_BYTES, 4194304). +-define(SCAN_BLOCK_SIZE, ?FILE_SIZE_LIMIT div 4). %%---------------------------------------------------------------------------- --include("rabbit_msg_store.hrl"). - -ifdef(use_specs). -type(position() :: non_neg_integer()). @@ -98,7 +98,7 @@ scan(FileHdl, FileSize) when FileSize >= 0 -> scan(_FileHdl, FileSize, _Data, FileSize, Acc, ScanOffset) -> {ok, Acc, ScanOffset}; scan(FileHdl, FileSize, Data, ReadOffset, Acc, ScanOffset) -> - Read = lists:min([?FOUR_MEGA_BYTES, (FileSize - ReadOffset)]), + Read = lists:min([?SCAN_BLOCK_SIZE, (FileSize - ReadOffset)]), case file_handle_cache:read(FileHdl, Read) of {ok, Data1} -> {Acc1, ScanOffset1, Data2} = diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index 6f1a5e6b00..7e09f7fa39 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -60,8 +60,6 @@ -define(FILE_EXTENSION, ".rdq"). -define(FILE_EXTENSION_TMP, ".rdt"). --define(FILE_SIZE_LIMIT, (16*1024*1024)). - -define(HANDLE_CACHE_BUFFER_SIZE, 1048576). %% 1MB %%---------------------------------------------------------------------------- |