diff options
| author | Matthias Radestock <matthias@lshift.net> | 2010-04-09 15:54:09 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2010-04-09 15:54:09 +0100 |
| commit | 996677caa9cb816415751195d49f34de4116a6dc (patch) | |
| tree | 3d84cf9717c1feb51886302749e1d12304840ad9 | |
| parent | dee56eb6e77d4fd719b1dfabdf3dbeaf6e1bed39 (diff) | |
| parent | 0803a8a4f955a37680eb01e264cf53a9668a2922 (diff) | |
| download | rabbitmq-server-git-996677caa9cb816415751195d49f34de4116a6dc.tar.gz | |
merge heads
| -rw-r--r-- | src/rabbit_channel.erl | 8 | ||||
| -rw-r--r-- | src/rabbit_router.erl | 8 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index a8c17efbde..a65bb31b52 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -962,10 +962,10 @@ fold_per_queue(F, Acc0, UAQ) -> D = rabbit_misc:queue_fold( fun ({_DTag, _CTag, {_QName, QPid, MsgId, _Redelivered, _Message}}, D) -> - %% dict:append would be simpler and avoid the - %% lists:reverse in handle_message({recover, true}, - %% ...). However, it is significantly slower when - %% going beyond a few thousand elements. + %% dict:append would avoid the lists:reverse in + %% handle_message({recover, true}, ...). However, it + %% is significantly slower when going beyond a few + %% thousand elements. rabbit_misc:dict_cons(QPid, MsgId, D) end, dict:new(), UAQ), dict:fold(fun (QPid, MsgIds, Acc) -> F(QPid, MsgIds, Acc) end, diff --git a/src/rabbit_router.erl b/src/rabbit_router.erl index 96337b42e7..a449e19eb4 100644 --- a/src/rabbit_router.erl +++ b/src/rabbit_router.erl @@ -76,11 +76,9 @@ deliver(QPids, Delivery) -> %% which then in turn delivers it to its queues. deliver_per_node( dict:to_list( - lists:foldl( - fun (QPid, D) -> - rabbit_misc:dict_cons(node(QPid), QPid, D) - end, - dict:new(), QPids)), + lists:foldl(fun (QPid, D) -> + rabbit_misc:dict_cons(node(QPid), QPid, D) + end, dict:new(), QPids)), Delivery). deliver_per_node([{Node, QPids}], Delivery) when Node == node() -> |