diff options
| author | Alvaro Videla <videlalvaro@gmail.com> | 2015-09-09 15:59:19 +0200 |
|---|---|---|
| committer | Alvaro Videla <videlalvaro@gmail.com> | 2015-09-09 15:59:19 +0200 |
| commit | 07db76a89770eea7c12a641507e9fc5c773d690f (patch) | |
| tree | 0f960c23fa99396683489e1e2cdf43e81730da44 /src | |
| parent | 990bc9a25d2cbd190a47364b9b4f48bd3074c591 (diff) | |
| download | rabbitmq-server-git-07db76a89770eea7c12a641507e9fc5c773d690f.tar.gz | |
uses remove_msgs_by_id/2 in places where same functionality was duplicated
Fixes #301
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_variable_queue.erl | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 765e9c4d9f..9448a71529 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -696,8 +696,7 @@ ack(AckTags, State) -> {accumulate_ack(MsgStatus, Acc), State3} end, {accumulate_ack_init(), State}, AckTags), IndexState1 = rabbit_queue_index:ack(IndexOnDiskSeqIds, IndexState), - [ok = msg_store_remove(MSCState, IsPersistent, MsgIds) - || {IsPersistent, MsgIds} <- orddict:to_list(MsgIdsByStore)], + remove_msgs_by_id(MsgIdsByStore, MSCState), {lists:reverse(AllMsgIds), a(State1 #vqstate { index_state = IndexState1, ack_out_counter = AckOutCount + length(AckTags) })}. @@ -1375,9 +1374,7 @@ remove_queue_entries(Q, DelsAndAcksFun, {MsgIdsByStore, Delivers, Acks, State1} = ?QUEUE:foldl(fun remove_queue_entries1/2, {orddict:new(), [], [], State}, Q), - ok = orddict:fold(fun (IsPersistent, MsgIds, ok) -> - msg_store_remove(MSCState, IsPersistent, MsgIds) - end, ok, MsgIdsByStore), + remove_msgs_by_id(MsgIdsByStore, MSCState), DelsAndAcksFun(Delivers, Acks, State1). remove_queue_entries1( |