diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-10-17 13:02:02 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-10-17 13:02:02 +0100 |
| commit | 93664a34c797d0b4dfcb26bd2898ff02fe55783b (patch) | |
| tree | eab57a207defbf4f73b0bef8d8593d3cc13ce6d0 | |
| parent | bcc19963081e7abfcc205840b73fed4d5784ab1a (diff) | |
| download | rabbitmq-server-bug24455.tar.gz | |
Minor tweaksbug24455
| -rw-r--r-- | src/rabbit_variable_queue.erl | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 37e822da..895fc388 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -1479,11 +1479,10 @@ reduce_memory_use(State) -> State), State1. -permitted_beta_count(#vqstate { target_ram_count = 0, - q3 = Q3 }) -> - lists:min([?QUEUE:len(Q3), rabbit_queue_index:next_segment_boundary(0)]); permitted_beta_count(#vqstate { len = 0 }) -> infinity; +permitted_beta_count(#vqstate { target_ram_count = 0, q3 = Q3 }) -> + lists:min([?QUEUE:len(Q3), rabbit_queue_index:next_segment_boundary(0)]); permitted_beta_count(#vqstate { q1 = Q1, q4 = Q4, target_ram_count = TargetRamCount, @@ -1667,17 +1666,9 @@ push_betas_to_deltas1(Generator, Limit, Q, {{value, #msg_status { seq_id = SeqId }}, _Qa} when SeqId < Limit -> {Q, PushState}; - {{value, MsgStatus = #msg_status { index_on_disk = IndexOnDisk, - seq_id = SeqId }}, Qa} -> - IndexState1 = - case IndexOnDisk of - true -> IndexState; - false -> {#msg_status { index_on_disk = true }, - IndexState2} = - maybe_write_index_to_disk(true, MsgStatus, - IndexState), - IndexState2 - end, + {{value, MsgStatus = #msg_status { seq_id = SeqId }}, Qa} -> + {#msg_status { index_on_disk = true }, IndexState1} = + maybe_write_index_to_disk(true, MsgStatus, IndexState), Delta1 = expand_delta(SeqId, Delta), push_betas_to_deltas1(Generator, Limit, Qa, {Quota - 1, Delta1, IndexState1}) |