Resolve a conflict (#8812)

Author: michaelklishin

deps/rabbit/src/rabbit_msg_store.erl

@@ -593,7 +593,7 @@ client_read2(false, _Right,
     %% It's entirely possible that everything we're doing from here on
     %% is for the wrong file, or a non-existent file, as a GC may have
     %% finished.
-    safe_ets_update_counter(
+    rabbit_misc:safe_ets_update_counter(
       FileSummaryEts, File, {#file_summary.readers, +1},
       fun (_) -> client_read3(MsgLocation, Defer, CState) end,
       fun () -> read(MsgId, CState) end).

deps/rabbit_common/src/file_handle_cache_stats.erl

@@ -9,7 +9,7 @@
 
 %% stats about read / write operations that go through the fhc.
 
--export([init/0, update/3, update/2, update/1, get/0]).
+-export([init/0, update/3, update/2, update/1, get/0, inc/2]).
 
 -define(TABLE, ?MODULE).
 
@@ -48,13 +48,10 @@ update(Op) ->
     _ = safe_ets_update_counter(?TABLE, {Op, count}, 1),
     ok.
 
-<<<<<<< HEAD
-=======
 inc(Op, Count) ->
     _ = safe_ets_update_counter(?TABLE, {Op, count}, Count),
     ok.
 
->>>>>>> d5d8689f54 (FHC: use safe versions of ets update functions)
 get() ->
     lists:sort(ets:tab2list(?TABLE)).
 

deps/rabbit_common/src/rabbit_misc.erl

@@ -79,12 +79,9 @@
 -export([raw_read_file/1]).
 -export([find_child/2]).
 -export([is_regular_file/1]).
-<<<<<<< HEAD
-=======
 -export([maps_any/2]).
 -export([safe_ets_update_counter/3, safe_ets_update_counter/4, safe_ets_update_counter/5,
          safe_ets_update_element/3, safe_ets_update_element/4, safe_ets_update_element/5]).
->>>>>>> d5d8689f54 (FHC: use safe versions of ets update functions)
 
 %% Horrible macro to use in guards
 -define(IS_BENIGN_EXIT(R),
@@ -1615,3 +1612,23 @@ find_powershell() ->
         PwshExe ->
             PwshExe
     end.
+
+%% Returns true if Pred(Key, Value) returns true for at least one Key to Value association in Map.
+%% The Pred function must return a boolean.
+-spec maps_any(Pred, Map) -> boolean() when
+    Pred :: fun((Key, Value) -> boolean()),
+    Map :: #{Key => Value}.
+maps_any(Pred, Map)
+when is_function(Pred, 2) andalso is_map(Map) ->
+  I = maps:iterator(Map),
+  maps_any_1(Pred, maps:next(I)).
+
+maps_any_1(_Pred, none) ->
+  false;
+maps_any_1(Pred, {K, V, I}) ->
+  case Pred(K, V) of
+      true ->
+          true;
+      false ->
+          maps_any_1(Pred, maps:next(I))
+  end.

deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_handler.erl

@@ -28,11 +28,7 @@
          upgrade/5,
          takeover/7]).
 
-<<<<<<< HEAD
--type option(T) :: undefined | T.
-=======
 -define(APP, rabbitmq_web_mqtt).
->>>>>>> 1402183bc2 (Introduce a way to disable FHC use in web_mqtt)
 
 -record(state, {
           socket :: {rabbit_proxy_socket, any(), any()} | rabbit_net:socket(),
@@ -41,9 +37,9 @@
                                                      rabbit_mqtt_processor:state(),
           connection_state = running :: running | blocked,
           conserve = false :: boolean(),
-          stats_timer :: option(rabbit_event:state()),
+          stats_timer :: rabbit_types:option(rabbit_event:state()),
           keepalive = rabbit_mqtt_keepalive:init() :: rabbit_mqtt_keepalive:state(),
-          conn_name :: option(binary()),
+          conn_name :: rabbit_types:option(binary()),
           should_use_fhc :: rabbit_types:option(boolean())
         }).