diff options
| author | Matthias Radestock <matthias@lshift.net> | 2009-09-08 14:01:28 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2009-09-08 14:01:28 +0100 |
| commit | 4c56adbe121efad7803bf33b3a713abfd35bcdca (patch) | |
| tree | 4fb0c4c4424658547bf6cf41496d4c020d0faf62 | |
| parent | 564fd500cd7bf64009bec118fd235883e983a115 (diff) | |
| download | rabbitmq-server-git-4c56adbe121efad7803bf33b3a713abfd35bcdca.tar.gz | |
minor tidying up: use symbolic record indices instead of numeric ones
| -rw-r--r-- | src/rabbit_msg_store.erl | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index da904193a0..241453c99f 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -270,24 +270,26 @@ init(Mode, Dir, FileSizeLimit, ReadFileHandlesLimit, RefCountFun, %% man says this should be <= 32M. But it works... {max_no_slots, 30*1024*1024}, {type, set}, - {keypos, 2} + {keypos, #msg_location.msg_id} ]), %% it would be better to have this as private, but dets:from_ets/2 %% seems to blow up if it is set private - see bug21489 - MsgLocationEts = ets:new(?MSG_LOC_NAME, [set, protected, {keypos, 2}]), + MsgLocationEts = ets:new(?MSG_LOC_NAME, + [set, protected, {keypos, #msg_location.msg_id}]), InitName = "0" ++ ?FILE_EXTENSION, HandleCache = rabbit_file_handle_cache:init(ReadFileHandlesLimit, ?BINARY_MODE ++ [read]), + FileSummary = ets:new(?FILE_SUMMARY_ETS_NAME, + [set, private, {keypos, #file_summary.file}]), + MessageCache = ets:new(?CACHE_ETS_NAME, [set, private]), State = #msstate { operation_mode = Mode, dir = Dir, msg_location_dets = MsgLocationDets, msg_location_ets = MsgLocationEts, - file_summary = ets:new( - ?FILE_SUMMARY_ETS_NAME, - [set, private, {keypos, 2}]), + file_summary = FileSummary, current_file_num = 0, current_file_name = InitName, current_file_handle = undefined, @@ -296,8 +298,7 @@ init(Mode, Dir, FileSizeLimit, ReadFileHandlesLimit, RefCountFun, file_size_limit = FileSizeLimit, read_file_handle_cache = HandleCache, last_sync_offset = 0, - message_cache = ets:new(?CACHE_ETS_NAME, - [set, private]), + message_cache = MessageCache, ets_bytes_per_record = EtsBytesPerRecord }, |