Use functions w/out _process as its more approp.

Author: LoisSotoLopez

deps/rabbit/src/rabbit_core_metrics_gc.erl

@@ -96,13 +96,13 @@ gc_global_queues() ->
     gc_process_and_entity(consumer_created, GbSet),
     ExchangeGbSet = gb_sets:from_list(rabbit_exchange:list_names()),
     gc_process_and_entities(channel_queue_exchange_metrics, GbSet, ExchangeGbSet),
-    gc_process_and_entities(queue_exchange_metrics, GbSet, ExchangeGbSet).
+    gc_entities(queue_exchange_metrics, GbSet, ExchangeGbSet).
 
 gc_exchanges() ->
     Exchanges = rabbit_exchange:list_names(),
     GbSet = gb_sets:from_list(Exchanges),
     gc_process_and_entity(channel_exchange_metrics, GbSet),
-    gc_process_and_entity(exchange_metrics, GbSet).
+    gc_entity(exchange_metrics, GbSet).
 
 gc_nodes() ->
     Nodes = rabbit_nodes:list_members(),
@@ -156,6 +156,12 @@ gc_entity(Table, GbSet) ->
                  ({Id = Key, _, _}, none) ->
                       gc_entity(Id, Table, Key, GbSet);
                  ({Id = Key, _, _, _, _}, none) ->
+                      gc_entity(Id, Table, Key, GbSet);
+                 ({Id = Key, _, _, _, _, _}, none)
+                    when Table == exchange_metrics ->
+                      gc_entity(Id, Table, Key, GbSet);
+                 ({Id = Key, _, _, _, _, _, _, _, _}, none)
+                    when Table == queue_counter_metrics ->
                       gc_entity(Id, Table, Key, GbSet)
               end, none, Table).
 
@@ -175,12 +181,6 @@ gc_process_and_entity(Table, GbSet) ->
                  ({{Pid, Id} = Key, _, _, _, _, _}, none)
                     when Table == channel_exchange_metrics ->
                       gc_process_and_entity(Id, Pid, Table, Key, GbSet);
-                 ({Id = Key, _, _, _, _, _}, none)
-                    when Table == exchange_metrics ->
-                      gc_entity(Id, Table, Key, GbSet);
-                 ({Id = Key, _, _, _, _, _, _, _, _}, none)
-                    when Table == queue_counter_metrics ->
-                      gc_entity(Id, Table, Key, GbSet);
                  ({{Id, Pid, _} = Key, _, _, _, _, _, _}, none)
                     when Table == consumer_created ->
                       gc_process_and_entity(Id, Pid, Table, Key, GbSet);
@@ -197,13 +197,15 @@ gc_process_and_entity(Id, Pid, Table, Key, GbSet) ->
             none
     end.
 
-gc_process_and_entities(Table, QueueGbSet, ExchangeGbSet) ->
-    ets:foldl(fun
-                  ({{QueueId, ExchangeId} = Key, _, _}, none)
+gc_entities(Table, QueueGbSet, ExchangeGbSet) ->
+    ets:foldl(fun({{QueueId, ExchangeId} = Key, _, _}, none)
                     when Table == queue_exchange_metrics ->
                       gc_entity(QueueId, Table, Key, QueueGbSet),
-                      gc_entity(ExchangeId, Table, Key, ExchangeGbSet);
-                  ({{Pid, {Q, X}} = Key, _, _}, none) ->
+                      gc_entity(ExchangeId, Table, Key, ExchangeGbSet)
+             end, none, Table).
+
+gc_process_and_entities(Table, QueueGbSet, ExchangeGbSet) ->
+    ets:foldl(fun({{Pid, {Q, X}} = Key, _, _}, none) ->
                       gc_process(Pid, Table, Key),
                       gc_entity(Q, Table, Key, QueueGbSet),
                       gc_entity(X, Table, Key, ExchangeGbSet)