diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-04-19 09:10:46 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-04-19 09:10:46 +0100 |
| commit | 42b0b0f3695edeb479164738332dad172583082f (patch) | |
| tree | fb5f2628402d01f1a228d321abffdbb702656553 | |
| parent | 3b654cdd71366f6cbdae37a7fff95a6b38cd35a6 (diff) | |
| download | rabbitmq-server-git-42b0b0f3695edeb479164738332dad172583082f.tar.gz | |
Beef up assertions on combine deltas, but it doesn't appear there was a bug here anyway
| -rw-r--r-- | src/rabbit_variable_queue.erl | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 9a8cb86e90..1a609dcc99 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -831,15 +831,25 @@ ensure_binary_properties(Msg = #basic_message { content = Content }) -> %% the first arg is the older delta combine_deltas(?BLANK_DELTA_PATTERN(X), ?BLANK_DELTA_PATTERN(Y)) -> ?BLANK_DELTA; -combine_deltas(?BLANK_DELTA_PATTERN(X), #delta { } = B) -> B; -combine_deltas(#delta { } = A, ?BLANK_DELTA_PATTERN(Y)) -> A; -combine_deltas(#delta { start_seq_id = SeqIdLow, count = CountLow}, - #delta { start_seq_id = SeqIdHigh, count = CountHigh, - end_seq_id = SeqIdEnd }) -> - true = SeqIdLow =< SeqIdHigh, %% ASSERTION +combine_deltas(?BLANK_DELTA_PATTERN(X), + #delta { start_seq_id = Start, count = Count, + end_seq_id = End } = B) -> + true = Start + Count =< End, %% ASSERTION + B; +combine_deltas(#delta { start_seq_id = Start, count = Count, + end_seq_id = End } = A, ?BLANK_DELTA_PATTERN(Y)) -> + true = Start + Count =< End, %% ASSERTION + A; +combine_deltas(#delta { start_seq_id = StartLow, count = CountLow, + end_seq_id = EndLow }, + #delta { start_seq_id = StartHigh, count = CountHigh, + end_seq_id = EndHigh }) -> Count = CountLow + CountHigh, - true = Count =< SeqIdEnd - SeqIdLow, %% ASSERTION - #delta { start_seq_id = SeqIdLow, count = Count, end_seq_id = SeqIdEnd }. + true = (StartLow =< StartHigh) %% ASSERTIONS + andalso ((StartLow + CountLow) =< EndLow) + andalso ((StartHigh + CountHigh) =< EndHigh) + andalso ((StartLow + Count) =< EndHigh), + #delta { start_seq_id = StartLow, count = Count, end_seq_id = EndHigh }. beta_fold_no_index_on_disk(Fun, Init, Q) -> bpqueue:foldr(fun (_Prefix, Value, Acc) -> @@ -1520,7 +1530,7 @@ push_betas_to_deltas(Generator, Limit, Q, Count, RamIndexCount, IndexState) -> {empty, Qa} -> {Count, Qa, RamIndexCount, IndexState}; {{value, _IndexOnDisk, #msg_status { seq_id = SeqId }}, _Qa} - when Limit /= undefined andalso SeqId < Limit -> + when Limit =/= undefined andalso SeqId < Limit -> {Count, Q, RamIndexCount, IndexState}; {{value, IndexOnDisk, MsgStatus}, Qa} -> {RamIndexCount1, IndexState1} = |