set_queue_ram_duration_target => set_queue_duration_target and ram_duration => queue_duration for censistency

4 files changed, 13 insertions, 13 deletions

diff --git a/include/rabbit_internal_queue_type_spec.hrl b/include/rabbit_internal_queue_type_spec.hrl
index 6409efb6f8..f8b6877a9c 100644
--- a/include/rabbit_internal_queue_type_spec.hrl
+++ b/include/rabbit_internal_queue_type_spec.hrl
@@ -33,10 +33,10 @@
 -spec(terminate/1 :: (state()) -> state()).
 -spec(publish/2 :: (basic_message(), state()) -> state()).
 -spec(publish_delivered/2 :: (basic_message(), state()) -> {ack(), state()}).
--spec(set_queue_ram_duration_target/2 ::
+-spec(set_queue_duration_target/2 ::
       (('undefined' | 'infinity' | number()), state()) -> state()).
 -spec(remeasure_rates/1 :: (state()) -> state()).
--spec(ram_duration/1 :: (state()) -> number()).
+-spec(queue_duration/1 :: (state()) -> number()).
 -spec(fetch/1 :: (state()) ->
              {('empty'|{basic_message(), boolean(), ack(), non_neg_integer()}),
               state()}).
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 7f43f79a6c..94e8662de6 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -932,17 +932,17 @@ handle_cast({flush, ChPid}, State) ->
 handle_cast(remeasure_rates, State = #q{internal_queue_state = IQS,
                                         internal_queue = IQ}) ->
     IQS1 = IQ:remeasure_rates(IQS),
-    RamDuration = IQ:ram_duration(IQS1),
+    RamDuration = IQ:queue_duration(IQS1),
     DesiredDuration =
         rabbit_memory_monitor:report_queue_duration(self(), RamDuration),
-    IQS2 = IQ:set_queue_ram_duration_target(DesiredDuration, IQS1),
+    IQS2 = IQ:set_queue_duration_target(DesiredDuration, IQS1),
     noreply(State#q{rate_timer_ref = just_measured,
                     internal_queue_state = IQS2});
 
 handle_cast({set_queue_duration, Duration},
             State = #q{internal_queue_state = IQS,
                        internal_queue = IQ}) ->
-    IQS1 = IQ:set_queue_ram_duration_target(Duration, IQS),
+    IQS1 = IQ:set_queue_duration_target(Duration, IQS),
     noreply(State#q{internal_queue_state = IQS1});
 
 handle_cast({set_maximum_since_use, Age}, State) ->
@@ -988,5 +988,5 @@ handle_pre_hibernate(State = #q{internal_queue_state = IQS,
     %% no activity for a while == 0 egress and ingress rates
     DesiredDuration =
         rabbit_memory_monitor:report_queue_duration(self(), infinity),
-    IQS2 = IQ:set_queue_ram_duration_target(DesiredDuration, IQS1),
+    IQS2 = IQ:set_queue_duration_target(DesiredDuration, IQS1),
     {hibernate, stop_rate_timer(State#q{internal_queue_state = IQS2})}.
diff --git a/src/rabbit_internal_queue_type.erl b/src/rabbit_internal_queue_type.erl
index 4ee4556a48..48d9314df2 100644
--- a/src/rabbit_internal_queue_type.erl
+++ b/src/rabbit_internal_queue_type.erl
@@ -74,11 +74,11 @@ behaviour_info(callbacks) ->
 
      {is_empty, 1},
 
-     {set_queue_ram_duration_target, 2},
+     {set_queue_duration_target, 2},
 
      {remeasure_rates, 1},
 
-     {ram_duration, 1},
+     {queue_duration, 1},
 
      %% Can return 'undefined' or a function atom name plus list of
      %% arguments to be invoked in the internal queue module as soon
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl
index 9bb031f3a8..c01ab5a450 100644
--- a/src/rabbit_variable_queue.erl
+++ b/src/rabbit_variable_queue.erl
@@ -32,8 +32,8 @@
 -module(rabbit_variable_queue).
 
 -export([init/2, terminate/1, publish/2, publish_delivered/2,
-         set_queue_ram_duration_target/2, remeasure_rates/1,
-         ram_duration/1, fetch/1, ack/2, len/1, is_empty/1, purge/1,
+         set_queue_duration_target/2, remeasure_rates/1,
+         queue_duration/1, fetch/1, ack/2, len/1, is_empty/1, purge/1,
          delete_and_terminate/1, requeue/2, tx_publish/2, tx_rollback/2,
          tx_commit/4, needs_sync/1, handle_pre_hibernate/1, status/1]).
 
@@ -344,7 +344,7 @@ publish_delivered(Msg = #basic_message { guid = MsgId,
             {ack_not_on_disk, State2}
     end.
 
-set_queue_ram_duration_target(
+set_queue_duration_target(
   DurationTarget, State = #vqstate { avg_egress_rate = AvgEgressRate,
                                      avg_ingress_rate = AvgIngressRate,
                                      target_ram_msg_count = TargetRamMsgCount
@@ -375,7 +375,7 @@ remeasure_rates(State = #vqstate { egress_rate = Egress,
     {AvgEgressRate, Egress1} = update_rate(Now, Timestamp, OutCount, Egress),
     {AvgIngressRate, Ingress1} = update_rate(Now, Timestamp, InCount, Ingress),
 
-    set_queue_ram_duration_target(
+    set_queue_duration_target(
       DurationTarget,
       State #vqstate { egress_rate = Egress1,
                        avg_egress_rate = AvgEgressRate,
@@ -385,7 +385,7 @@ remeasure_rates(State = #vqstate { egress_rate = Egress,
                        ram_msg_count_prev = RamMsgCount,
                        out_counter = 0, in_counter = 0 }).
 
-ram_duration(#vqstate { avg_egress_rate = AvgEgressRate,
+queue_duration(#vqstate { avg_egress_rate = AvgEgressRate,
                         avg_ingress_rate = AvgIngressRate,
                         ram_msg_count = RamMsgCount,
                         ram_msg_count_prev = RamMsgCountPrev }) ->