diff options
| author | Matthias Radestock <matthias@lshift.net> | 2010-05-28 16:25:12 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2010-05-28 16:25:12 +0100 |
| commit | 0718dff0192a6730927bf78654bfd862ebfb1fd2 (patch) | |
| tree | f20b630cc38b64ae5f9108d3b6ec8f29991162d3 | |
| parent | 695a70cfdd18eb08855f0a3cab973dcbbed7afdc (diff) | |
| download | rabbitmq-server-git-0718dff0192a6730927bf78654bfd862ebfb1fd2.tar.gz | |
inlining
| -rw-r--r-- | src/rabbit_queue_index.erl | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl index c34523d17f..1cb7fa927a 100644 --- a/src/rabbit_queue_index.erl +++ b/src/rabbit_queue_index.erl @@ -670,10 +670,6 @@ seq_id_to_seg_and_rel_seq_id(SeqId) -> reconstruct_seq_id(Seg, RelSeq) -> (Seg * ?SEGMENT_ENTRY_COUNT) + RelSeq. -seg_num_to_path(Dir, Seg) -> - SegName = integer_to_list(Seg), - filename:join(Dir, SegName ++ ?SEGMENT_EXTENSION). - all_segment_nums(#qistate { dir = Dir, segments = Segments }) -> lists:sort( sets:to_list( @@ -689,8 +685,10 @@ all_segment_nums(#qistate { dir = Dir, segments = Segments }) -> segment_find_or_new(Seg, Dir, Segments) -> case segment_find(Seg, Segments) of {ok, Segment} -> Segment; - error -> #segment { num = Seg, - path = seg_num_to_path(Dir, Seg), + error -> SegName = integer_to_list(Seg) ++ ?SEGMENT_EXTENSION, + Path = filename:join(Dir, SegName), + #segment { num = Seg, + path = Path, journal_entries = array_new(), unacked = 0 } end. |