diff options
| author | Tim Fox <tim@rabbitmq.com> | 2011-02-16 17:33:46 +0000 |
|---|---|---|
| committer | Tim Fox <tim@rabbitmq.com> | 2011-02-16 17:33:46 +0000 |
| commit | 678b492717dda20c36cec1a4fc7d4d2fe2ea3ed5 (patch) | |
| tree | 41eec0877145b9ddb4e9f1f1a940cf6cd4de7943 | |
| parent | 0b2b3854a9f2a7480560b5200cf87d797e57119b (diff) | |
| download | rabbitmq-server-678b492717dda20c36cec1a4fc7d4d2fe2ea3ed5.tar.gz | |
make sure all unconfirmed msg structures use gb_sets rather than sets
| -rw-r--r-- | src/rabbit_channel.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index f69a49b1..a666d917 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -510,7 +510,7 @@ process_confirms(MsgSeqNos, QPid, State = #ch{unconfirmed_mq = UMQ, {MXs, State#ch{unconfirmed_mq = UMQ1, unconfirmed_qm = UQM1}}. confirm_msg(MsgSeqNo, QPid, {XName, Qs}, {MXs, UC, UQM}, State) -> - Qs1 = sets:del_element(QPid, Qs), + Qs1 = gb_sets:del_element(QPid, Qs), %% these confirms will be emitted even when a queue dies, but that %% should be fine, since the queue stats get erased immediately maybe_incr_stats([{{QPid, XName}, 1}], confirm, State), @@ -523,7 +523,7 @@ confirm_msg(MsgSeqNo, QPid, {XName, Qs}, {MXs, UC, UQM}, State) -> end; error -> UQM end, - case sets:size(Qs1) of + case gb_sets:size(Qs1) of 0 -> {[{MsgSeqNo, XName} | MXs], gb_trees:delete(MsgSeqNo, UC), UQM1}; _ -> {MXs, gb_trees:update(MsgSeqNo, {XName, Qs1}, UC), UQM1} end. @@ -1263,7 +1263,7 @@ process_routing_result(routed, _, _, undefined, _, State) -> State; process_routing_result(routed, QPids, XName, MsgSeqNo, _, State) -> #ch{unconfirmed_mq = UMQ, unconfirmed_qm = UQM} = State, - UMQ1 = gb_trees:insert(MsgSeqNo, {XName, sets:from_list(QPids)}, UMQ), + UMQ1 = gb_trees:insert(MsgSeqNo, {XName, gb_sets:from_list(QPids)}, UMQ), SingletonSet = gb_sets:singleton(MsgSeqNo), UQM1 = lists:foldl(fun (QPid, UQM2) -> maybe_monitor(QPid), |