summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2013-05-14 14:31:42 +0100
committerEmile Joubert <emile@rabbitmq.com>2013-05-14 14:31:42 +0100
commitad1f0620e302bf62ae30fa24cac79eb079101fbc (patch)
tree577d30bb30a0939f7f427b506072c018bb3a6d72
parenta452b5d2b0fc0bf22a5b35d3df7abfe4de32afea (diff)
downloadrabbitmq-server-bug25390.tar.gz
Implement feedbackbug25390
-rw-r--r--src/rabbit_queue_index.erl7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl
index 230639ee..847d39c1 100644
--- a/src/rabbit_queue_index.erl
+++ b/src/rabbit_queue_index.erl
@@ -123,7 +123,7 @@
-define(REL_SEQ_BITS, 14).
-define(SEGMENT_ENTRY_COUNT, 16384). %% trunc(math:pow(2,?REL_SEQ_BITS))).
-%% seq only is binary 00 followed by 14 bits of rel seq id
+%% seq only is binary 01 followed by 14 bits of rel seq id
%% (range: 0 - 16383)
-define(REL_SEQ_ONLY_PREFIX, 01).
-define(REL_SEQ_ONLY_PREFIX_BITS, 2).
@@ -718,10 +718,9 @@ load_journal_entries(State = #qistate { journal_handle = Hdl }) ->
case file_handle_cache:read(Hdl, ?PUB_RECORD_BODY_BYTES) of
%% Journal entry composed only of zeroes was probably
%% produced during a dirty shutdown so stop reading
- {ok, <<0:?PUB_RECORD_BODY_BYTES/unit:8>>}
- when Prefix =:= ?PUB_PERSIST_JPREFIX ->
+ {ok, <<0:?PUB_RECORD_BODY_BYTES/unit:8>>} ->
State;
- {ok, <<Bin:?PUB_RECORD_BODY_BYTES/binary-unit:8>>} ->
+ {ok, <<Bin:?PUB_RECORD_BODY_BYTES/binary>>} ->
{MsgId, MsgProps} = parse_pub_record_body(Bin),
IsPersistent = case Prefix of
?PUB_PERSIST_JPREFIX -> true;