diff options
| author | Alvaro Videla <videlalvaro@gmail.com> | 2015-10-14 01:40:19 +0200 |
|---|---|---|
| committer | Alvaro Videla <videlalvaro@gmail.com> | 2015-10-14 01:40:19 +0200 |
| commit | ee19ec06d56bc73a8ba542f9202ba7a7f5bccc56 (patch) | |
| tree | 90172abc0b04a442b47ec717b37d50ab2ab67da4 | |
| parent | 963953842918a287df05dd8c9dbe712835b116e7 (diff) | |
| download | rabbitmq-server-git-ee19ec06d56bc73a8ba542f9202ba7a7f5bccc56.tar.gz | |
fixes stats/delta handling on publish_delivered
| -rw-r--r-- | src/rabbit_variable_queue.erl | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 2bb737f742..441eafd006 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -1776,23 +1776,19 @@ publish_delivered1(Msg = #basic_message { is_persistent = IsPersistent, out_counter = OutCount, in_counter = InCount, durable = IsDurable, - unconfirmed = UC, - delta = Delta }) -> + unconfirmed = UC }) -> IsPersistent1 = IsDurable andalso IsPersistent, MsgStatus = msg_status(IsPersistent1, true, SeqId, Msg, MsgProps, IndexMaxSize), {MsgStatus1, State1} = PersistFun(true, true, MsgStatus, State), - Delta1 = expand_delta(SeqId, Delta), State2 = record_pending_ack(m(MsgStatus1), State1), UC1 = gb_sets_maybe_insert(NeedsConfirming, MsgId, UC), - State3 = stats({0, 1}, {lazy, MsgStatus1}, - State2 #vqstate { delta = Delta1, - next_seq_id = SeqId + 1, + State3 = stats({0, 1}, {none, MsgStatus1}, + State2 #vqstate { next_seq_id = SeqId + 1, out_counter = OutCount + 1, in_counter = InCount + 1, unconfirmed = UC1 }), {SeqId, State3}. - batch_publish_delivered1({Msg, MsgProps}, {ChPid, Flow, SeqIds, State}) -> {SeqId, State1} = publish_delivered1(Msg, MsgProps, ChPid, Flow, |