diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-04-07 14:35:59 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-04-07 14:35:59 +0100 |
| commit | 76b43be634a465624c8ac7317935f9edd601ece1 (patch) | |
| tree | 9b27caf9db6f2e78369676465403872710e5586b | |
| parent | eb8add1e061d65ba150935c2733abcb023643d81 (diff) | |
| download | rabbitmq-server-git-76b43be634a465624c8ac7317935f9edd601ece1.tar.gz | |
Simplification of function called from one place only
| -rw-r--r-- | src/rabbit_queue_index.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl index ee4f05b4d2..5257f20112 100644 --- a/src/rabbit_queue_index.erl +++ b/src/rabbit_queue_index.erl @@ -267,7 +267,7 @@ init(Name, MsgStoreRecovered) -> array:sparse_foldl( fun (RelSeq, {{MsgId, _IsPersistent}, Del, no_ack}, Segment3) -> - {Segment4, _DCountDelta} = + Segment4 = maybe_add_to_journal( rabbit_msg_store:contains( ?PERSISTENT_MSG_STORE, MsgId), @@ -309,15 +309,15 @@ init(Name, MsgStoreRecovered) -> {Count, PRef, TRef, Terms, State3}. maybe_add_to_journal( true, true, _Del, _RelSeq, Segment) -> - {Segment, 0}; + Segment; maybe_add_to_journal( true, false, del, _RelSeq, Segment) -> - {Segment, 0}; + Segment; maybe_add_to_journal( true, false, _Del, RelSeq, Segment) -> - {add_to_journal(RelSeq, del, Segment), 1}; + add_to_journal(RelSeq, del, Segment); maybe_add_to_journal(false, _, del, RelSeq, Segment) -> - {add_to_journal(RelSeq, ack, Segment), 1}; + add_to_journal(RelSeq, ack, Segment); maybe_add_to_journal(false, _, _Del, RelSeq, Segment) -> - {add_to_journal(RelSeq, ack, add_to_journal(RelSeq, del, Segment)), 2}. + add_to_journal(RelSeq, ack, add_to_journal(RelSeq, del, Segment)). terminate(Terms, State) -> terminate(true, Terms, State). |