diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-06-14 22:50:54 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-06-14 22:50:54 +0300 |
| commit | 47639b5bd91f55d60cf5a6bd12d7bbe82c8805ae (patch) | |
| tree | 4f4a3d051e731bb8943bb19441b547559b3e95a1 /src | |
| parent | 5388143188f8e36274891c9be48438a3342a45c8 (diff) | |
| parent | d8d72f12867599a1687b32a99a50fd4ce8ddbe1b (diff) | |
| download | rabbitmq-server-git-47639b5bd91f55d60cf5a6bd12d7bbe82c8805ae.tar.gz | |
Merge branch 'stable'
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_priority_queue.erl | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/rabbit_priority_queue.erl b/src/rabbit_priority_queue.erl index a3bfb5cdfa..ae8a38daf0 100644 --- a/src/rabbit_priority_queue.erl +++ b/src/rabbit_priority_queue.erl @@ -591,10 +591,15 @@ partition_publish_delivered_batch(Publishes, MaxP) -> Publishes, fun ({Msg, _}) -> Msg end, MaxP). partition_publishes(Publishes, ExtractMsg, MaxP) -> - lists:foldl(fun (Pub, Dict) -> - Msg = ExtractMsg(Pub), - rabbit_misc:orddict_cons(priority(Msg, MaxP), Pub, Dict) - end, orddict:new(), Publishes). + Partitioned = + lists:foldl(fun (Pub, Dict) -> + Msg = ExtractMsg(Pub), + rabbit_misc:orddict_cons(priority(Msg, MaxP), Pub, Dict) + end, orddict:new(), Publishes), + orddict:map(fun (_P, RevPubs) -> + lists:reverse(RevPubs) + end, Partitioned). + priority_bq(Priority, [{MaxP, _} | _] = BQSs) -> bq_fetch(priority(Priority, MaxP), BQSs). |
