diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2014-02-06 12:37:30 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2014-02-06 12:37:30 +0000 |
| commit | 9b96f69d77e7030446e10895bb4cf7783eef9bfd (patch) | |
| tree | d46a0ae5f818cc2d7cc957a39a68c9cfbb3c63b8 | |
| parent | eef1bfb6d8d1a6c01fea2dcf76d4db3860cdba04 (diff) | |
| download | rabbitmq-server-git-9b96f69d77e7030446e10895bb4cf7783eef9bfd.tar.gz | |
rename misleading variables
...and fix a counting error
| -rw-r--r-- | src/rabbit_queue_index.erl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl index 8f2abb55be..d780241dbb 100644 --- a/src/rabbit_queue_index.erl +++ b/src/rabbit_queue_index.erl @@ -465,17 +465,17 @@ recover_segment(ContainsCheckFun, CleanShutdown, segment_plus_journal(SegEntries, JEntries), array:sparse_foldl( fun (RelSeq, {{MsgId, _MsgProps, _IsPersistent}, Del, no_ack}, - Segment1) -> + SegmentAndDirtyCount) -> recover_message(ContainsCheckFun(MsgId), CleanShutdown, - Del, RelSeq, Segment1) + Del, RelSeq, SegmentAndDirtyCount) end, {Segment #segment { unacked = UnackedCount + UnackedCountDelta }, 0}, SegEntries1). -recover_message( true, true, _Del, _RelSeq, Segment) -> - Segment; -recover_message( true, false, del, _RelSeq, Segment) -> - Segment; +recover_message( true, true, _Del, _RelSeq, SegmentAndDirtyCount) -> + SegmentAndDirtyCount; +recover_message( true, false, del, _RelSeq, SegmentAndDirtyCount) -> + SegmentAndDirtyCount; recover_message( true, false, no_del, RelSeq, {Segment, DirtyCount}) -> {add_to_journal(RelSeq, del, Segment), DirtyCount + 1}; recover_message(false, _, del, RelSeq, {Segment, DirtyCount}) -> @@ -483,7 +483,7 @@ recover_message(false, _, del, RelSeq, {Segment, DirtyCount}) -> recover_message(false, _, no_del, RelSeq, {Segment, DirtyCount}) -> {add_to_journal(RelSeq, ack, add_to_journal(RelSeq, del, Segment)), - DirtyCount + 1}. + DirtyCount + 2}. queue_name_to_dir_name(Name = #resource { kind = queue }) -> <<Num:128>> = erlang:md5(term_to_binary(Name)), |