fixup! WIP Remove CQv1

Author: lhoguin

deps/rabbit/src/rabbit_classic_queue_index_v2.erl

@@ -19,7 +19,7 @@
 %% Implementation details from the queue index leaking into the
 %% queue implementation itself.
 %% @todo TODO
--export([sync/1, needs_sync/1, flush/1,
+-export([sync/1, needs_sync/1,
          bounds/2, next_segment_boundary/1]).
 
 %% Called by rabbit_vhost.
@@ -948,15 +948,6 @@ needs_sync(State = #qi{ confirms = Confirms }) ->
         false -> confirms
     end.
 
--spec flush(State) -> State when State::state().
-
-flush(State) ->
-    ?DEBUG("~0p", [State]),
-    %% Flushing to disk is the same operation as sync
-    %% except it is called before hibernating or when
-    %% reducing memory use.
-    sync(State).
-
 %% ----
 
 -type walker(A) :: fun ((A) -> 'finished' |

deps/rabbit/src/rabbit_variable_queue.erl

@@ -710,30 +710,12 @@ needs_timeout(#vqstate { index_state = IndexState,
         {false, true}  -> false
     end.
 
-timeout(State = #vqstate { index_state = IndexState0,
-                           store_state = StoreState0,
-                           unconfirmed_simple = UCS,
-                           confirmed   = C }) ->
-    IndexState = rabbit_classic_queue_index_v2:sync(IndexState0),
-    StoreState = rabbit_classic_queue_store_v2:sync(StoreState0),
-    State #vqstate { index_state = IndexState,
-                     store_state = StoreState,
-                     unconfirmed_simple = sets:new([{version,2}]),
-                     confirmed   = sets:union(C, UCS) }.
-
-handle_pre_hibernate(State = #vqstate { index_state = IndexState0,
-                                        store_state = StoreState0,
-                                        msg_store_clients = MSCState0,
-                                        unconfirmed_simple = UCS,
-                                        confirmed   = C }) ->
+timeout(State) ->
+    sync(State).
+
+handle_pre_hibernate(State = #vqstate{ msg_store_clients = MSCState0 }) ->
     MSCState = msg_store_pre_hibernate(MSCState0),
-    IndexState = rabbit_classic_queue_index_v2:flush(IndexState0),
-    StoreState = rabbit_classic_queue_store_v2:sync(StoreState0),
-    State #vqstate { index_state = IndexState,
-                     store_state = StoreState,
-                     msg_store_clients = MSCState,
-                     unconfirmed_simple = sets:new([{version,2}]),
-                     confirmed   = sets:union(C, UCS) }.
+    sync(State#vqstate{ msg_store_clients = MSCState }).
 
 resume(State) -> a(timeout(State)).