Simplify

Author: ansd

deps/rabbit/src/mc.erl

@@ -366,60 +366,54 @@ record_death(Reason, SourceQueue,
       ?ANN_ROUTING_KEYS := RoutingKeys} = Anns0,
     Timestamp = os:system_time(millisecond),
     Ttl = maps:get(ttl, Anns0, undefined),
-    DeathAnns = rabbit_misc:maps_put_truthy(ttl, Ttl, #{first_time => Timestamp,
-                                                        last_time => Timestamp}),
-    case Anns0 of
-        #{deaths := Deaths = #deaths{records = Rs0}} ->
-            Rs = if is_list(Rs0) ->
-                        %% records are ordered by recency
-                        case lists:keytake(Key, 1, Rs0) of
-                            {value, {Key, D0}, Rs1} ->
-                                D = update_death(D0, Timestamp),
-                                [{Key, D} | Rs1];
+    DeathAnns = rabbit_misc:maps_put_truthy(
+                  ttl, Ttl, #{first_time => Timestamp,
+                              last_time => Timestamp}),
+    NewDeath = #death{exchange = Exchange,
+                      routing_keys = RoutingKeys,
+                      count = 1,
+                      anns = DeathAnns},
+    Anns = case Anns0 of
+               #{deaths := Deaths = #deaths{records = Rs0}} ->
+                   Rs = case is_list(Rs0) of
+                            true ->
+                                %% records are ordered by recency
+                                case lists:keytake(Key, 1, Rs0) of
+                                    {value, {Key, D0}, Rs1} ->
+                                        D = update_death(D0, Timestamp),
+                                        [{Key, D} | Rs1];
+                                    false ->
+                                        [{Key, NewDeath} | Rs0]
+                                end;
                             false ->
-                                [{Key, #death{exchange = Exchange,
-                                              routing_keys = RoutingKeys,
-                                              count = 1,
-                                              anns = DeathAnns}} | Rs0]
-                        end;
-                    is_map(Rs0) ->
-                        case Rs0 of
-                            #{Key := Death} ->
-                                Rs0#{Key := update_death(Death, Timestamp)};
-                            _ ->
-                                Rs0#{Key => #death{exchange = Exchange,
-                                                   routing_keys = RoutingKeys,
-                                                   count = 1,
-                                                   anns = DeathAnns}}
-                        end
-                 end,
-            Anns = Anns0#{<<"x-last-death-reason">> := atom_to_binary(Reason),
+                                maps:update_with(
+                                  Key,
+                                  fun(Death) -> update_death(Death, Timestamp) end,
+                                  NewDeath,
+                                  Rs0)
+                        end,
+                   Anns0#{<<"x-last-death-reason">> := atom_to_binary(Reason),
                           <<"x-last-death-queue">> := SourceQueue,
                           <<"x-last-death-exchange">> := Exchange,
                           deaths := Deaths#deaths{last = Key,
-                                                  records = Rs}},
-            State#?MODULE{annotations = Anns};
-        _ ->
-            Death = #death{exchange = Exchange,
-                           routing_keys = RoutingKeys,
-                           count = 1,
-                           anns = DeathAnns},
-            Rs = case rabbit_feature_flags:is_enabled(message_containers_deaths_v2) of
-                     true -> [{Key, Death}];
-                     false -> #{Key => Death}
-                 end,
-            ReasonBin = atom_to_binary(Reason),
-            Anns = Anns0#{<<"x-first-death-reason">> => ReasonBin,
+                                                  records = Rs}};
+               _ ->
+                   Rs = case rabbit_feature_flags:is_enabled(message_containers_deaths_v2) of
+                            true -> [{Key, NewDeath}];
+                            false -> #{Key => NewDeath}
+                        end,
+                   ReasonBin = atom_to_binary(Reason),
+                   Anns0#{<<"x-first-death-reason">> => ReasonBin,
                           <<"x-first-death-queue">> => SourceQueue,
                           <<"x-first-death-exchange">> => Exchange,
                           <<"x-last-death-reason">> => ReasonBin,
                           <<"x-last-death-queue">> => SourceQueue,
                           <<"x-last-death-exchange">> => Exchange,
                           deaths => #deaths{last = Key,
                                             first = Key,
-                                            records = Rs}},
-            State#?MODULE{annotations = Anns}
-    end;
+                                            records = Rs}}
+           end,
+    State#?MODULE{annotations = Anns};
 record_death(Reason, SourceQueue, BasicMsg) ->
     mc_compat:record_death(Reason, SourceQueue, BasicMsg).
 
@@ -429,27 +423,27 @@ update_death(#death{count = Count,
                 anns = DeathAnns#{last_time := Timestamp}}.
 
 -spec is_death_cycle(rabbit_misc:resource_name(), state()) -> boolean().
-is_death_cycle(TargetQueue, #?MODULE{annotations = #{deaths := #deaths{records = Recs}}})
-  when is_list(Recs) ->
-    is_cycle_v2(TargetQueue, Recs);
-is_death_cycle(TargetQueue, #?MODULE{annotations = #{deaths := #deaths{records = Recs}}})
-  when is_map(Recs) ->
-    is_cycle_v1(TargetQueue, maps:keys(Recs));
+is_death_cycle(TargetQueue, #?MODULE{annotations = #{deaths := #deaths{records = Rs}}}) ->
+    if is_list(Rs) ->
+           is_cycle_v2(TargetQueue, Rs);
+       is_map(Rs) ->
+           is_cycle_v1(TargetQueue, maps:keys(Rs))
+    end;
 is_death_cycle(_TargetQueue, #?MODULE{}) ->
     false;
 is_death_cycle(TargetQueue, BasicMsg) ->
     mc_compat:is_death_cycle(TargetQueue, BasicMsg).
 
 %% Returns death queue names ordered by recency.
 -spec death_queue_names(state()) -> [rabbit_misc:resource_name()].
-death_queue_names(#?MODULE{annotations = #{deaths := #deaths{records = Records}}})
-  when is_list(Records) ->
-    lists:map(fun({{Queue, _Reason}, _Death}) ->
-                      Queue
-              end, Records);
-death_queue_names(#?MODULE{annotations = #{deaths := #deaths{records = Records}}})
-  when is_map(Records) ->
-    proplists:get_keys(maps:keys(Records));
+death_queue_names(#?MODULE{annotations = #{deaths := #deaths{records = Rs}}}) ->
+    if is_list(Rs) ->
+           lists:map(fun({{Queue, _Reason}, _Death}) ->
+                             Queue
+                     end, Rs);
+       is_map(Rs) ->
+           proplists:get_keys(maps:keys(Rs))
+    end;
 death_queue_names(#?MODULE{}) ->
     [];
 death_queue_names(BasicMsg) ->
@@ -474,7 +468,7 @@ is_cycle_v2(TargetQueue, Deaths) ->
             %% There is a cycle, but we only want to drop the message
             %% if the cycle is "fully automatic", i.e. without a client
             %% expliclity rejecting the message somewhere in the cycle.
-            lists:all(fun({{_SourceQueue, Reason}, #death{}}) ->
+            lists:all(fun({{_SourceQueue, Reason}, _Death}) ->
                               Reason =/= rejected
                       end, [H | L])
     end.

deps/rabbit/src/mc_amqpl.erl

@@ -604,8 +604,8 @@ convert_from_amqp_deaths({array, map, Maps}) ->
                    {{symbol, <<"queue">>}, {utf8, Queue}},
                    {{symbol, <<"reason">>}, {symbol, Reason}},
                    {{symbol, <<"count">>}, {ulong, Count}},
-                   {{symbol, <<"first_time">>}, {timestamp, FirstTime}},
-                   {{symbol, <<"last_time">>}, {timestamp, _LastTime}},
+                   {{symbol, <<"first-time">>}, {timestamp, FirstTime}},
+                   {{symbol, <<"last-time">>}, {timestamp, _LastTime}},
                    {{symbol, <<"exchange">>}, {utf8, Exchange}},
                    {{symbol, <<"routing-keys">>}, {array, utf8, RKeys0}}
                   ] = KvList1,