diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-10-04 16:46:01 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-10-04 16:46:01 +0100 |
| commit | 4742406a766b769c74cb4bee4f7f25f91ca00365 (patch) | |
| tree | 76e5da5cd9a1a27a961a1952bcbc1059965d78f1 | |
| parent | e23caa6dce26b7eae1192a245ba38fddcb655597 (diff) | |
| download | rabbitmq-server-git-4742406a766b769c74cb4bee4f7f25f91ca00365.tar.gz | |
no more warnings
| -rw-r--r-- | src/rabbit_msg_store.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_variable_queue.erl | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index ff6ff96cc5..17f8fb1d7e 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -854,7 +854,7 @@ internal_sync(State = #msstate { current_file_handle = CurHdl, end, lists:foreach(fun (K) -> K() end, lists:reverse(Syncs)), [(dict:fetch(CRef, CODC))(Guids) || {CRef, Guids} <- CGs], - State #msstate { cref_to_guids = dict:new(), + State1 #msstate { cref_to_guids = dict:new(), on_sync = [] }. diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 7d84c840f4..6165444409 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -1160,8 +1160,8 @@ remove_pending_ack(KeepPersistent, ack(_MsgStoreFun, _Fun, [], State) -> {State, []}; ack(MsgStoreFun, Fun, AckTags, State) -> - {Guids, {SeqIds, GuidsByStore}, State1 = #vqstate { index_state = IndexState, - persistent_count = PCount }} = + {AckdGuids, {SeqIds, GuidsByStore}, State1 = #vqstate { index_state = IndexState, + persistent_count = PCount }} = lists:foldl( fun (SeqId, {Gs, Acc, State2 = #vqstate { pending_ack = PA }}) -> {ok, AckEntry} = dict:find(SeqId, PA), @@ -1174,11 +1174,11 @@ ack(MsgStoreFun, Fun, AckTags, State) -> ok = orddict:fold(fun (MsgStore, Guids, ok) -> MsgStoreFun(MsgStore, Guids) end, ok, GuidsByStore), - State2 = remove_confirms(gb_sets:from_list(Guids), State1), + State2 = remove_confirms(gb_sets:from_list(AckdGuids), State1), PCount1 = PCount - find_persistent_count(sum_guids_by_store_to_len( orddict:new(), GuidsByStore)), {State2 #vqstate { index_state = IndexState1, - persistent_count = PCount1 }, Guids}. + persistent_count = PCount1 }, AckdGuids}. accumulate_ack(_SeqId, #msg_status { is_persistent = false, %% ASSERTIONS msg_on_disk = false, |