summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2012-04-11 17:44:43 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2012-04-11 17:44:43 +0100
commitab70e46216a39360d5e19da0e34d00fc26c342c4 (patch)
tree869b8c39df19bfb8cdd2f04ec895218209b6305a
parenteb12abb53722eb68e6c515e83bcbdf40772e784e (diff)
downloadrabbitmq-server-ab70e46216a39360d5e19da0e34d00fc26c342c4.tar.gz
cosmetic
-rw-r--r--src/rabbit_msg_store.erl4
-rw-r--r--src/rabbit_variable_queue.erl12
2 files changed, 7 insertions, 9 deletions
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl
index 8ffd5b13..d69dad1f 100644
--- a/src/rabbit_msg_store.erl
+++ b/src/rabbit_msg_store.erl
@@ -1240,8 +1240,8 @@ client_confirm(CRef, MsgIds, ActionTaken, State) ->
case dict:find(CRef, CTM) of
{ok, Gs} -> MsgOnDiskFun(gb_sets:intersection(Gs, MsgIds),
ActionTaken),
- MsgIds1 =
- rabbit_misc:gb_sets_difference(Gs, MsgIds),
+ MsgIds1 = rabbit_misc:gb_sets_difference(
+ Gs, MsgIds),
case gb_sets:is_empty(MsgIds1) of
true -> dict:erase(CRef, CTM);
false -> dict:store(CRef, MsgIds1, CTM)
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl
index 6e8a1cca..64d3b05c 100644
--- a/src/rabbit_variable_queue.erl
+++ b/src/rabbit_variable_queue.erl
@@ -1291,13 +1291,11 @@ record_confirms(MsgIdSet, State = #vqstate { msgs_on_disk = MOD,
msg_indices_on_disk = MIOD,
unconfirmed = UC,
confirmed = C }) ->
- State #vqstate { msgs_on_disk =
- rabbit_misc:gb_sets_difference(MOD, MsgIdSet),
- msg_indices_on_disk =
- rabbit_misc:gb_sets_difference(MIOD, MsgIdSet),
- unconfirmed =
- rabbit_misc:gb_sets_difference(UC, MsgIdSet),
- confirmed = gb_sets:union(C, MsgIdSet) }.
+ State #vqstate {
+ msgs_on_disk = rabbit_misc:gb_sets_difference(MOD, MsgIdSet),
+ msg_indices_on_disk = rabbit_misc:gb_sets_difference(MIOD, MsgIdSet),
+ unconfirmed = rabbit_misc:gb_sets_difference(UC, MsgIdSet),
+ confirmed = gb_sets:union(C, MsgIdSet) }.
must_sync_index(#vqstate { msg_indices_on_disk = MIOD,
unconfirmed = UC }) ->