QQ more minor format changes

Should result in slighlt less gc pressure on deliveries. Every little helps.
rabbitmq · Feb 6, 2023 · 6f1b819 · 6f1b819
1 parent e724900
commit 6f1b819
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/deps/rabbit/src/rabbit_fifo.erl b/deps/rabbit/src/rabbit_fifo.erl
@@ -1876,9 +1876,9 @@ checkout(#{index := Index} = Meta,
     end.
 
 checkout0(Meta, {success, ConsumerId, MsgId,
-                 ?MSG(RaftIdx, Header), ExpiredMsg, State, Effects},
+                 ?MSG(_RaftIdx, _Header) = Msg, ExpiredMsg, State, Effects},
           SendAcc0) ->
-    DelMsg = {RaftIdx, MsgId, Header},
+    DelMsg = {MsgId, Msg},
     SendAcc = case maps:get(ConsumerId, SendAcc0, undefined) of
                   undefined ->
                       SendAcc0#{ConsumerId => [DelMsg]};
@@ -1948,13 +1948,13 @@ chunk_disk_msgs([], _Bytes, [[] | Chunks]) ->
     Chunks;
 chunk_disk_msgs([], _Bytes, Chunks) ->
     Chunks;
-chunk_disk_msgs([{_RaftIdx, _MsgId, Header} = Msg | Rem],
+chunk_disk_msgs([{_MsgId, ?MSG(_RaftIdx, Header)} = Msg | Rem],
                 Bytes,
                 [CurChunk | Chunks])
   when Bytes >= ?DELIVERY_CHUNK_LIMIT_B ->
     Size = get_header(size, Header),
     chunk_disk_msgs(Rem, Size, [[], [Msg | CurChunk] | Chunks]);
-chunk_disk_msgs([{_RaftIdx, _MsgId, Header} = Msg | Rem], Bytes,
+chunk_disk_msgs([{_MsgId, ?MSG(_RaftIdx, Header)} = Msg | Rem], Bytes,
                 [CurChunk | Chunks]) ->
     Size = get_header(size, Header),
     chunk_disk_msgs(Rem, Bytes + Size, [[Msg | CurChunk] | Chunks]).
@@ -2000,18 +2000,18 @@ get_next_msg(#?MODULE{returns = Returns0,
             Msg
     end.
 
-delivery_effect({CTag, CPid}, [{Idx, MsgId, Header}],
+delivery_effect({CTag, CPid}, [{MsgId, [Idx | Header]}],
                 #?MODULE{msg_cache = {Idx, RawMsg}}) ->
     {send_msg, CPid, {delivery, CTag, [{MsgId, {Header, RawMsg}}]},
      [local, ra_event]};
 delivery_effect({CTag, CPid}, Msgs, _State) ->
-    RaftIdxs = lists:foldr(fun ({I, _, _}, Acc) ->
+    RaftIdxs = lists:foldr(fun ({_, ?MSG(I, _)}, Acc) ->
                                    [I | Acc]
                            end, [], Msgs),
     {log, RaftIdxs,
      fun(Log) ->
              DelMsgs = lists:zipwith(
-                         fun (Cmd, {_RaftIdx, MsgId, Header}) ->
+                         fun (Cmd, {MsgId, ?MSG(_Idx,  Header)}) ->
                                  {MsgId, {Header, get_msg(Cmd)}}
                          end, Log, Msgs),
              [{send_msg, CPid, {delivery, CTag, DelMsgs}, [local, ra_event]}]