fixup! WIP Remove CQv1

Author: lhoguin

deps/rabbit/src/rabbit_classic_queue_index_v2.erl

@@ -448,7 +448,7 @@ info(#qi{ write_buffer = WriteBuffer, write_buffer_updates = NumUpdates }) ->
 -spec publish(rabbit_types:msg_id(), rabbit_variable_queue:seq_id(),
               rabbit_variable_queue:msg_location(),
               rabbit_types:message_properties(), boolean(),
-              non_neg_integer() | infinity, State) -> State when State::state().
+              boolean(), State) -> State when State::state().
 
 %% Because we always persist to the msg_store, the Msg(Or)Id argument
 %% here is always a binary, never a record.

deps/rabbit/src/rabbit_variable_queue.erl

@@ -1993,11 +1993,8 @@ delta_merge(SeqIds, Delta, MsgIds, State) ->
                                 Acc;
                         {#msg_status { msg_id = MsgId,
                                        is_persistent = IsPersistent } = MsgStatus, State1} ->
-%                                {_MsgStatus, State2} =
-%                                    maybe_prepare_write_to_disk(true, true, MsgStatus, State1),
-                                State2 = State1,
                                 {expand_delta(SeqId, Delta0, IsPersistent), [MsgId | MsgIds0],
-                                 stats_requeued_disk(MsgStatus, State2)}
+                                 stats_requeued_disk(MsgStatus, State1)}
                         end
                 end, {Delta, MsgIds, State}, SeqIds).