diff options
author | Emile Joubert <emile@rabbitmq.com> | 2013-01-04 12:16:12 +0000 |
---|---|---|
committer | Emile Joubert <emile@rabbitmq.com> | 2013-01-04 12:16:12 +0000 |
commit | e1220e0133aa10d98e8af0e4318b4885e74a9757 (patch) | |
tree | ace8960ade36af0ea17e213f5acb88a632335696 | |
parent | 3c29df8f13138df0a600ca5f642f0048784d6317 (diff) | |
download | rabbitmq-server-e1220e0133aa10d98e8af0e4318b4885e74a9757.tar.gz |
Remove confirm_all
-rw-r--r-- | src/dtree.erl | 24 | ||||
-rw-r--r-- | src/rabbit_amqqueue_process.erl | 1 | ||||
-rw-r--r-- | src/rabbit_channel.erl | 9 | ||||
-rw-r--r-- | src/rabbit_misc.erl | 5 |
4 files changed, 4 insertions, 35 deletions
diff --git a/src/dtree.erl b/src/dtree.erl index c59243bb..ca2d30cf 100644 --- a/src/dtree.erl +++ b/src/dtree.erl @@ -32,7 +32,7 @@ -module(dtree). --export([empty/0, insert/4, take/3, take/2, take_all/2, take_prim/2, +-export([empty/0, insert/4, take/3, take/2, take_all/2, is_defined/2, is_empty/1, smallest/1, size/1]). %%---------------------------------------------------------------------------- @@ -53,7 +53,6 @@ -spec(take/3 :: ([pk()], sk(), ?MODULE()) -> {[kv()], ?MODULE()}). -spec(take/2 :: (sk(), ?MODULE()) -> {[kv()], ?MODULE()}). -spec(take_all/2 :: (sk(), ?MODULE()) -> {[kv()], ?MODULE()}). --spec(take_prim/2 :: (pk(), ?MODULE()) -> {[kv()], ?MODULE()}). -spec(is_defined/2 :: (sk(), ?MODULE()) -> boolean()). -spec(is_empty/1 :: (?MODULE()) -> boolean()). -spec(smallest/1 :: (?MODULE()) -> kv()). @@ -121,13 +120,6 @@ take_all(SK, {P, S}) -> {KVs, {P1, prune(SKS, PKS, S)}} end. -%% Drop the entry with the given primary key -take_prim(PK, {P, S} = DTree) -> - case gb_trees:lookup(PK, P) of - none -> {[], DTree}; - {value, {SKS, V}} -> {[{PK, V}], take_prim2(PK, SKS, DTree)} - end. - is_defined(SK, {_P, S}) -> gb_trees:is_defined(SK, S). is_empty({P, _S}) -> gb_trees:is_empty(P). @@ -157,20 +149,6 @@ take_all2(PKS, P) -> gb_trees:delete(PK, P0)} end, {[], gb_sets:empty(), P}, PKS). -take_prim2(PK, SKS, {P, S}) -> - {gb_trees:delete(PK, P), - rabbit_misc:gb_trees_fold( - fun (SK0, PKS, S1) -> - case gb_sets:is_member(SK0, SKS) of - false -> S1; - true -> PKS1 = gb_sets:delete(PK, PKS), - case gb_sets:is_empty(PKS1) of - true -> gb_trees:delete(SK0, S1); - false -> gb_trees:update(SK0, PKS1, S1) - end - end - end, S, S)}. - prune(SKS, PKS, S) -> gb_sets:fold(fun (SK0, S0) -> PKS1 = gb_trees:get(SK0, S0), diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index f588c024..09f01109 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -595,7 +595,6 @@ publish_max(#delivery{message = Message, BQ:publish(Message, Props, Delivered, SenderPid, BQS); {true, true} -> (dead_letter_fun(maxdepth))([{Message, undefined}]), - rabbit_misc:confirm_all(SenderPid, MsgSeqNo), nopub; {true, false} -> {{Msg, _IsDelivered, AckTag}, BQS1} = BQ:fetch(true, BQS), diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 885452ce..1af60de8 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -228,9 +228,8 @@ prioritise_call(Msg, _From, _State) -> prioritise_cast(Msg, _State) -> case Msg of - {confirm, _MsgSeqNos, _QPid} -> 5; - {confirm_all, _MsgSeqNo, _QPid} -> 5; - _ -> 0 + {confirm, _MsgSeqNos, _QPid} -> 5; + _ -> 0 end. prioritise_info(Msg, _State) -> @@ -557,10 +556,6 @@ confirm(MsgSeqNos, QPid, State = #ch{unconfirmed = UC}) -> {MXs, UC1} = dtree:take(MsgSeqNos, QPid, UC), record_confirms(MXs, State#ch{unconfirmed = UC1}). -confirm_all(MsgSeqNo, State = #ch{unconfirmed = UC}) -> - {MXs, UC1} = dtree:take_prim(MsgSeqNo, UC), - record_confirms(MXs, State#ch{unconfirmed = UC1}). - handle_method(#'channel.open'{}, _, State = #ch{state = starting}) -> {reply, #'channel.open_ok'{}, State#ch{state = running}}; diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index c6c8676f..edaa7198 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -28,7 +28,7 @@ -export([enable_cover/0, report_cover/0]). -export([enable_cover/1, report_cover/1]). -export([start_cover/1]). --export([confirm_to_sender/2, confirm_all/2]). +-export([confirm_to_sender/2]). -export([throw_on_error/2, with_exit_handler/2, is_abnormal_exit/1, filter_exit_map/2]). -export([with_user/2, with_user_and_vhost/3]). @@ -427,9 +427,6 @@ report_coverage_percentage(File, Cov, NotCov, Mod) -> confirm_to_sender(Pid, MsgSeqNos) -> gen_server2:cast(Pid, {confirm, MsgSeqNos, self()}). -confirm_all(Pid, MsgSeqNo) -> - gen_server2:cast(Pid, {confirm_all, MsgSeqNo, self()}). - %% @doc Halts the emulator returning the given status code to the os. %% On Windows this function will block indefinitely so as to give the io %% subsystem time to flush stdout completely. |