rename queue_index:terminate_and_erase to delete_and_terminate

to match the corresponding function in variable_queue

3 files changed, 11 insertions, 11 deletions

diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl
index 92127da18d..f1b4346a6c 100644
--- a/src/rabbit_queue_index.erl
+++ b/src/rabbit_queue_index.erl
@@ -31,7 +31,7 @@
 
 -module(rabbit_queue_index).
 
--export([init/3, terminate/2, terminate_and_erase/1, publish/4,
+-export([init/3, terminate/2, delete_and_terminate/1, publish/4,
          deliver/2, ack/2, sync/2, flush/1, read/3,
          next_segment_boundary/1, bounds/1, recover/1]).
 
@@ -188,7 +188,7 @@
 -spec(init/3 :: (queue_name(), boolean(), fun ((guid()) -> boolean())) ->
              {'undefined' | non_neg_integer(), [any()], qistate()}).
 -spec(terminate/2 :: ([any()], qistate()) -> qistate()).
--spec(terminate_and_erase/1 :: (qistate()) -> qistate()).
+-spec(delete_and_terminate/1 :: (qistate()) -> qistate()).
 -spec(publish/4 :: (guid(), seq_id(), boolean(), qistate()) -> qistate()).
 -spec(deliver/2 :: (seq_id(), qistate()) -> qistate()).
 -spec(ack/2 :: ([seq_id()], qistate()) -> qistate()).
@@ -227,7 +227,7 @@ init(Name, MsgStoreRecovered, ContainsCheckFun) ->
 terminate(Terms, State) ->
     terminate(true, Terms, State).
 
-terminate_and_erase(State) ->
+delete_and_terminate(State) ->
     State1 = terminate(false, [], State),
     ok = rabbit_misc:recursive_delete([State1 #qistate.dir]),
     State1.
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index 49ebb32ba3..646ac03f64 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -1395,7 +1395,7 @@ test_queue() ->
 empty_test_queue() ->
     ok = rabbit_variable_queue:start([]),
     {0, _Terms, Qi1} = test_queue_init(),
-    _Qi2 = rabbit_queue_index:terminate_and_erase(Qi1),
+    _Qi2 = rabbit_queue_index:delete_and_terminate(Qi1),
     ok.
 
 queue_index_publish(SeqIds, Persistent, Qi) ->
@@ -1487,7 +1487,7 @@ test_queue_index() ->
     ok = rabbit_variable_queue:start([test_queue()]),
     %% should get length back as 0 because all persistent msgs have been acked
     {0, _Terms3, Qi20} = test_queue_init(),
-    _Qi21 = rabbit_queue_index:terminate_and_erase(Qi20),
+    _Qi21 = rabbit_queue_index:delete_and_terminate(Qi20),
     ok = stop_msg_store(),
     ok = empty_test_queue(),
 
@@ -1501,7 +1501,7 @@ test_queue_index() ->
     Qi25 = rabbit_queue_index:ack(SeqIdsC, Qi24),
     Qi26 = queue_index_flush(Qi25),
     {Qi27, _SeqIdsGuidsC1} = queue_index_publish([SegmentSize], false, Qi26),
-    _Qi28 = rabbit_queue_index:terminate_and_erase(Qi27),
+    _Qi28 = rabbit_queue_index:delete_and_terminate(Qi27),
     ok = stop_msg_store(),
     ok = empty_test_queue(),
 
@@ -1512,7 +1512,7 @@ test_queue_index() ->
     {Qi32, _SeqIdsGuidsC3} = queue_index_publish([SegmentSize], false, Qi31),
     Qi33 = rabbit_queue_index:ack(SeqIdsC, Qi32),
     Qi34 = queue_index_flush(Qi33),
-    _Qi35 = rabbit_queue_index:terminate_and_erase(Qi34),
+    _Qi35 = rabbit_queue_index:delete_and_terminate(Qi34),
     ok = stop_msg_store(),
     ok = empty_test_queue(),
 
@@ -1523,7 +1523,7 @@ test_queue_index() ->
     Qi38 = queue_index_deliver(SeqIdsD, Qi37),
     Qi39 = rabbit_queue_index:ack(SeqIdsD, Qi38),
     Qi40 = queue_index_flush(Qi39),
-    _Qi41 = rabbit_queue_index:terminate_and_erase(Qi40),
+    _Qi41 = rabbit_queue_index:delete_and_terminate(Qi40),
     ok = stop_msg_store(),
     ok = empty_test_queue(),
 
@@ -1543,7 +1543,7 @@ test_queue_index() ->
     ok = verify_read_with_published(true, false, ReadD, [Four, Five, Six]),
     {ReadE, undefined, Qi52} = rabbit_queue_index:read(7, 9, Qi51),
     ok = verify_read_with_published(false, false, ReadE, [Seven, Eight]),
-    _Qi53 = rabbit_queue_index:terminate_and_erase(Qi52),
+    _Qi53 = rabbit_queue_index:delete_and_terminate(Qi52),
     ok = stop_msg_store(),
     ok = empty_test_queue(),
 
@@ -1564,7 +1564,7 @@ test_queue_index() ->
     ok = stop_msg_store(),
     ok = rabbit_variable_queue:start([test_queue()]),
     {5, _Terms10, Qi64} = test_queue_init(),
-    _Qi65 = rabbit_queue_index:terminate_and_erase(Qi64),
+    _Qi65 = rabbit_queue_index:delete_and_terminate(Qi64),
 
     ok = stop_msg_store(),
     ok = rabbit_variable_queue:start([]),
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl
index cc876b5e6a..3d485106d3 100644
--- a/src/rabbit_variable_queue.erl
+++ b/src/rabbit_variable_queue.erl
@@ -398,7 +398,7 @@ delete_and_terminate(State) ->
             {DeltaSeqId, NextSeqId, IndexState3} ->
                 delete1(PersistentStore, TransientThreshold, NextSeqId, DeltaSeqId, IndexState3)
         end,
-    IndexState5 = rabbit_queue_index:terminate_and_erase(IndexState2),
+    IndexState5 = rabbit_queue_index:delete_and_terminate(IndexState2),
     rabbit_msg_store:delete_client(PersistentStore, PRef),
     rabbit_msg_store:delete_client(?TRANSIENT_MSG_STORE, TRef),
     rabbit_msg_store:client_terminate(MSCStateP),