diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-10-09 14:32:23 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-10-09 14:32:23 +0100 |
| commit | a9149a4a4ab9e99de7d2571b74647fb625d9a6bf (patch) | |
| tree | acf9947707179d47625e944b8404bb3eb987f18c /src | |
| parent | 2b962b08311054ee40b24093879d6a653b3ae035 (diff) | |
| download | rabbitmq-server-git-a9149a4a4ab9e99de7d2571b74647fb625d9a6bf.tar.gz | |
switching back to lists:min and lists:max as erlang:min/max do not exist in R12
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_disk_queue.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_msg_store.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_variable_queue.erl | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_disk_queue.erl b/src/rabbit_disk_queue.erl index 19f5a74eea..42c4ed8bf5 100644 --- a/src/rabbit_disk_queue.erl +++ b/src/rabbit_disk_queue.erl @@ -716,8 +716,8 @@ extract_sequence_numbers(Sequences) -> [] -> ets:insert_new(Sequences, {Q, SeqId, NextWrite}); [Orig = {_, Read, Write}] -> - Repl = {Q, erlang:min(Read, SeqId), - erlang:max(Write, NextWrite)}, + Repl = {Q, lists:min([Read, SeqId]), + lists:max([Write, NextWrite])}, case Orig == Repl of true -> true; false -> ets:insert(Sequences, Repl) diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index 70f8627ebd..b0b75249c1 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -508,7 +508,7 @@ remove_message(MsgId, State = #msstate { file_summary = FileSummary }) -> [FSEntry = #file_summary { valid_total_size = ValidTotalSize, contiguous_top = ContiguousTop }] = ets:lookup(FileSummary, File), - ContiguousTop1 = erlang:min(ContiguousTop, Offset), + ContiguousTop1 = lists:min([ContiguousTop, Offset]), ValidTotalSize1 = ValidTotalSize - TotalSize, true = ets:insert(FileSummary, FSEntry #file_summary { valid_total_size = ValidTotalSize1, diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 4dbcefc89f..c197f6b028 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -239,7 +239,7 @@ maybe_start_prefetcher(State = #vqstate { ram_msg_count = RamMsgCount, target_ram_msg_count = TargetRamMsgCount, q3 = Q3, prefetcher = undefined }) -> - PrefetchCount = erlang:min(queue:len(Q3), TargetRamMsgCount - RamMsgCount), + PrefetchCount = lists:min([queue:len(Q3), TargetRamMsgCount - RamMsgCount]), if PrefetchCount =< 0 -> State; true -> {PrefetchQueue, Q3a} = queue:split(PrefetchCount, Q3), |