summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2010-06-22 18:56:00 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2010-06-22 18:56:00 +0100
commit1726042ba98e84d7aaa55a9f2da9793f9df72a28 (patch)
tree95fa39cefd9b9d990bdfdc40a131ba71c08cc5e9
parent94a4dc455dbcc400e9baad696f74729206f05da4 (diff)
downloadrabbitmq-server-1726042ba98e84d7aaa55a9f2da9793f9df72a28.tar.gz
cosmetic
-rw-r--r--src/rabbit_variable_queue.erl32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl
index 113bd0f5..958a2903 100644
--- a/src/rabbit_variable_queue.erl
+++ b/src/rabbit_variable_queue.erl
@@ -1101,6 +1101,22 @@ maybe_write_to_disk(ForceMsg, ForceIndex, MsgStatus,
%% Phase changes
%%----------------------------------------------------------------------------
+reduce_memory_use(State = #vqstate {
+ target_ram_msg_count = infinity }) ->
+ State;
+reduce_memory_use(State = #vqstate {
+ ram_msg_count = RamMsgCount,
+ target_ram_msg_count = TargetRamMsgCount })
+ when TargetRamMsgCount >= RamMsgCount ->
+ limit_ram_index(State);
+reduce_memory_use(State = #vqstate {
+ target_ram_msg_count = TargetRamMsgCount }) ->
+ State1 = maybe_push_q4_to_betas(maybe_push_q1_to_betas(State)),
+ case TargetRamMsgCount of
+ 0 -> push_betas_to_deltas(State1);
+ _ -> limit_ram_index(State1)
+ end.
+
limit_ram_index(State = #vqstate { ram_index_count = RamIndexCount }) ->
Permitted = permitted_ram_index_count(State),
if Permitted =/= infinity andalso RamIndexCount > Permitted ->
@@ -1151,22 +1167,6 @@ permitted_ram_index_count(#vqstate { len = Len,
BetaLen = bpqueue:len(Q2) + bpqueue:len(Q3),
BetaLen - trunc(BetaLen * BetaLen / (Len - DeltaCount)).
-reduce_memory_use(State = #vqstate {
- target_ram_msg_count = infinity }) ->
- State;
-reduce_memory_use(State = #vqstate {
- ram_msg_count = RamMsgCount,
- target_ram_msg_count = TargetRamMsgCount })
- when TargetRamMsgCount >= RamMsgCount ->
- limit_ram_index(State);
-reduce_memory_use(State = #vqstate {
- target_ram_msg_count = TargetRamMsgCount }) ->
- State1 = maybe_push_q4_to_betas(maybe_push_q1_to_betas(State)),
- case TargetRamMsgCount of
- 0 -> push_betas_to_deltas(State1);
- _ -> limit_ram_index(State1)
- end.
-
maybe_deltas_to_betas(State = #vqstate { delta = ?BLANK_DELTA_PATTERN(X) }) ->
State;
maybe_deltas_to_betas(State = #vqstate {