diff options
| author | Matthias Radestock <matthias@lshift.net> | 2009-09-07 17:41:13 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2009-09-07 17:41:13 +0100 |
| commit | 6d89e86148174f2abc8a83ddb71555c498a25a16 (patch) | |
| tree | edb9b025d951c4ef3af6e0a4804f0377339bf5b8 | |
| parent | 6ce99b7c6ff4707b1fb6f7d87dba932eafd50e8e (diff) | |
| download | rabbitmq-server-git-6d89e86148174f2abc8a83ddb71555c498a25a16.tar.gz | |
refactoring: move dets/ets match into sort_msg_locations_by_offset
| -rw-r--r-- | src/rabbit_msg_store.erl | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index e2e13ec8ed..357c4867e7 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -827,16 +827,12 @@ load_messages(RefCountFun, Files, State) -> load_messages(_RefCountFun, Left, [], State) -> Num = list_to_integer(filename:rootname(Left)), Offset = - case dets_ets_match_object(State, #msg_location { - file = Left, _ = '_' }) of + case sort_msg_locations_by_offset(desc, Left, State) of [] -> 0; - L -> - [ #msg_location { file = Left, - offset = MaxOffset, - total_size = TotalSize} | _ ] = - sort_msg_locations_by_offset(desc, L), + [#msg_location { offset = MaxOffset, + total_size = TotalSize } | _] -> MaxOffset + TotalSize - end, + end, State #msstate { current_file_num = Num, current_file_name = Left, current_offset = Offset }; load_messages(RefCountFun, Left, [File|Files], @@ -975,7 +971,7 @@ adjust_meta_and_combine( true -> {false, State} end. -sort_msg_locations_by_offset(Dir, List) -> +sort_msg_locations_by_offset(Dir, File, State) -> Comp = case Dir of asc -> fun erlang:'<'/2; desc -> fun erlang:'>'/2 @@ -983,7 +979,8 @@ sort_msg_locations_by_offset(Dir, List) -> lists:sort(fun (#msg_location { offset = OffA }, #msg_location { offset = OffB }) -> Comp(OffA, OffB) - end, List). + end, dets_ets_match_object( + State, #msg_location { file = File, _ = '_' })). combine_files(#file_summary { file = Source, valid_total_size = SourceValid, @@ -1023,10 +1020,7 @@ combine_files(#file_summary { file = Source, %% that the list should be naturally sorted %% as we require, however, we need to %% enforce it anyway - end, sort_msg_locations_by_offset( - asc, dets_ets_match_object( - State1, #msg_location { - file = Destination, _ = '_' }))), + end, sort_msg_locations_by_offset(asc, Destination, State1)), ok = copy_messages( Worklist, DestinationContiguousTop, DestinationValid, DestinationHdl, TmpHdl, Destination, State1), @@ -1044,10 +1038,7 @@ combine_files(#file_summary { file = Source, ok = file:close(TmpHdl), ok = file:delete(form_filename(Dir, Tmp)) end, - SourceWorkList = - sort_msg_locations_by_offset( - asc, dets_ets_match_object(State1, #msg_location { - file = Source, _ = '_' })), + SourceWorkList = sort_msg_locations_by_offset(asc, Source, State1), ok = copy_messages(SourceWorkList, DestinationValid, ExpectedSize, SourceHdl, DestinationHdl, Destination, State1), %% tidy up |