diff options
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_mixed_queue.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 38 |
3 files changed, 25 insertions, 25 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index c65c65edbc..99951ae1d3 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -527,7 +527,7 @@ i(storage_mode, #q{ mixed_state = MS }) -> i(pid, _) -> self(); i(messages_ready, #q { mixed_state = MS }) -> - rabbit_mixed_queue:length(MS); + rabbit_mixed_queue:len(MS); i(messages_unacknowledged, _) -> lists:sum([dict:size(UAM) || #cr{unacked_messages = UAM} <- all_ch_record()]); @@ -706,12 +706,12 @@ handle_call({basic_cancel, ChPid, ConsumerTag, OkMsg}, _From, handle_call(stat, _From, State = #q{q = #amqqueue{name = Name}, mixed_state = MS, active_consumers = ActiveConsumers}) -> - Length = rabbit_mixed_queue:length(MS), + Length = rabbit_mixed_queue:len(MS), reply({ok, Name, Length, queue:len(ActiveConsumers)}, State); handle_call({delete, IfUnused, IfEmpty}, _From, State = #q { mixed_state = MS }) -> - Length = rabbit_mixed_queue:length(MS), + Length = rabbit_mixed_queue:len(MS), IsEmpty = Length == 0, IsUnused = is_unused(State), if diff --git a/src/rabbit_mixed_queue.erl b/src/rabbit_mixed_queue.erl index 2e8fb333bb..60920b21a7 100644 --- a/src/rabbit_mixed_queue.erl +++ b/src/rabbit_mixed_queue.erl @@ -37,7 +37,7 @@ -export([publish/2, publish_delivered/2, fetch/1, ack/2, tx_publish/2, tx_commit/3, tx_cancel/2, requeue/2, purge/1, - length/1, is_empty/1, delete_queue/1, maybe_prefetch/1]). + len/1, is_empty/1, delete_queue/1, maybe_prefetch/1]). -export([set_storage_mode/3, storage_mode/1, estimate_queue_memory_and_reset_counters/1]). @@ -88,7 +88,7 @@ -spec(delete_queue/1 :: (mqstate()) -> {'ok', mqstate()}). --spec(length/1 :: (mqstate()) -> non_neg_integer()). +-spec(len/1 :: (mqstate()) -> non_neg_integer()). -spec(is_empty/1 :: (mqstate()) -> boolean()). -spec(set_storage_mode/3 :: (mode(), [message()], mqstate()) -> okmqs()). @@ -553,7 +553,7 @@ delete_queue(State = #mqstate { queue = Q, memory_size = QSize, {ok, lose_memory(QSize, State #mqstate { length = 0, msg_buf = queue:new(), prefetcher = undefined })}. -length(#mqstate { length = Length }) -> +len(#mqstate { length = Length }) -> Length. is_empty(#mqstate { length = Length }) -> diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 33ede609e8..ae4117aa58 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -1109,15 +1109,15 @@ rdq_test_mixed_queue_modes() -> {ok, MS5a} = rabbit_mixed_queue:publish(Msg, MS5), MS5a end, MS4, lists:seq(1,10)), - 30 = rabbit_mixed_queue:length(MS6), + 30 = rabbit_mixed_queue:len(MS6), io:format("Published a mixture of messages; ~w~n", [rabbit_mixed_queue:estimate_queue_memory_and_reset_counters(MS6)]), {ok, MS7} = rabbit_mixed_queue:set_storage_mode(disk, [], MS6), - 30 = rabbit_mixed_queue:length(MS7), + 30 = rabbit_mixed_queue:len(MS7), io:format("Converted to disk only mode; ~w~n", [rabbit_mixed_queue:estimate_queue_memory_and_reset_counters(MS7)]), {ok, MS8} = rabbit_mixed_queue:set_storage_mode(mixed, [], MS7), - 30 = rabbit_mixed_queue:length(MS8), + 30 = rabbit_mixed_queue:len(MS8), io:format("Converted to mixed mode; ~w~n", [rabbit_mixed_queue:estimate_queue_memory_and_reset_counters(MS8)]), MS10 = @@ -1129,15 +1129,15 @@ rdq_test_mixed_queue_modes() -> MS9a} = rabbit_mixed_queue:fetch(MS9), MS9a end, MS8, lists:seq(1,10)), - 20 = rabbit_mixed_queue:length(MS10), + 20 = rabbit_mixed_queue:len(MS10), io:format("Delivered initial non persistent messages~n"), {ok, MS11} = rabbit_mixed_queue:set_storage_mode(disk, [], MS10), - 20 = rabbit_mixed_queue:length(MS11), + 20 = rabbit_mixed_queue:len(MS11), io:format("Converted to disk only mode~n"), rdq_stop(), rdq_start(), MS12 = rdq_new_mixed_queue(q, true, false), - 10 = rabbit_mixed_queue:length(MS12), + 10 = rabbit_mixed_queue:len(MS12), io:format("Recovered queue~n"), {MS14, AckTags} = lists:foldl( @@ -1148,16 +1148,16 @@ rdq_test_mixed_queue_modes() -> MS13a} = rabbit_mixed_queue:fetch(MS13), {MS13a, [{Msg, AckTag} | AcksAcc]} end, {MS12, []}, lists:seq(1,10)), - 0 = rabbit_mixed_queue:length(MS14), + 0 = rabbit_mixed_queue:len(MS14), {ok, MS15} = rabbit_mixed_queue:ack(AckTags, MS14), io:format("Delivered and acked all messages~n"), {ok, MS16} = rabbit_mixed_queue:set_storage_mode(disk, [], MS15), - 0 = rabbit_mixed_queue:length(MS16), + 0 = rabbit_mixed_queue:len(MS16), io:format("Converted to disk only mode~n"), rdq_stop(), rdq_start(), MS17 = rdq_new_mixed_queue(q, true, false), - 0 = rabbit_mixed_queue:length(MS17), + 0 = rabbit_mixed_queue:len(MS17), {MS17,0,0,0} = rabbit_mixed_queue:estimate_queue_memory_and_reset_counters(MS17), io:format("Recovered queue~n"), rdq_stop(), @@ -1200,28 +1200,28 @@ rdq_test_mode_conversion_mid_txn() -> passed. rdq_tx_publish_mixed_alter_commit_get(MS0, MsgsA, MsgsB, Mode, CommitOrCancel) -> - 0 = rabbit_mixed_queue:length(MS0), + 0 = rabbit_mixed_queue:len(MS0), MS2 = lists:foldl( fun (Msg, MS1) -> {ok, MS1a} = rabbit_mixed_queue:publish(Msg, MS1), MS1a end, MS0, MsgsA), Len0 = length(MsgsA), - Len0 = rabbit_mixed_queue:length(MS2), + Len0 = rabbit_mixed_queue:len(MS2), MS4 = lists:foldl( fun (Msg, MS3) -> {ok, MS3a} = rabbit_mixed_queue:tx_publish(Msg, MS3), MS3a end, MS2, MsgsB), - Len0 = rabbit_mixed_queue:length(MS4), + Len0 = rabbit_mixed_queue:len(MS4), {ok, MS5} = rabbit_mixed_queue:set_storage_mode(Mode, MsgsB, MS4), - Len0 = rabbit_mixed_queue:length(MS5), + Len0 = rabbit_mixed_queue:len(MS5), {ok, MS9} = case CommitOrCancel of commit -> {ok, MS6} = rabbit_mixed_queue:tx_commit(MsgsB, [], MS5), Len1 = Len0 + length(MsgsB), - Len1 = rabbit_mixed_queue:length(MS6), + Len1 = rabbit_mixed_queue:len(MS6), {AckTags, MS8} = lists:foldl( fun (Msg, {Acc, MS7}) -> @@ -1230,11 +1230,11 @@ rdq_tx_publish_mixed_alter_commit_get(MS0, MsgsA, MsgsB, Mode, CommitOrCancel) - rabbit_mixed_queue:fetch(MS7), {[{Msg, AckTag} | Acc], MS7a} end, {[], MS6}, MsgsA ++ MsgsB), - 0 = rabbit_mixed_queue:length(MS8), + 0 = rabbit_mixed_queue:len(MS8), rabbit_mixed_queue:ack(AckTags, MS8); cancel -> {ok, MS6} = rabbit_mixed_queue:tx_cancel(MsgsB, MS5), - Len0 = rabbit_mixed_queue:length(MS6), + Len0 = rabbit_mixed_queue:len(MS6), {AckTags, MS8} = lists:foldl( fun (Msg, {Acc, MS7}) -> @@ -1243,14 +1243,14 @@ rdq_tx_publish_mixed_alter_commit_get(MS0, MsgsA, MsgsB, Mode, CommitOrCancel) - rabbit_mixed_queue:fetch(MS7), {[{Msg, AckTag} | Acc], MS7a} end, {[], MS6}, MsgsA), - 0 = rabbit_mixed_queue:length(MS8), + 0 = rabbit_mixed_queue:len(MS8), rabbit_mixed_queue:ack(AckTags, MS8) end, - 0 = rabbit_mixed_queue:length(MS9), + 0 = rabbit_mixed_queue:len(MS9), Msg = rdq_message(0, <<0:256>>, false), {ok, AckTag, MS10} = rabbit_mixed_queue:publish_delivered(Msg, MS9), {ok,MS11} = rabbit_mixed_queue:ack([{Msg, AckTag}], MS10), - 0 = rabbit_mixed_queue:length(MS11), + 0 = rabbit_mixed_queue:len(MS11), passed. rdq_test_disk_queue_modes() -> |