rabbit_db: Remove rabbit_db:run/1

[Why]
In the Khepri ingration branch, we use a function which switches between
Khepri and Mnesia. This function is specific to Khepri, in particular to
support the migration from Mnesia to Khepri. It is also temporary and
will go away once Mnesia code is dropped.

[How]
We go back to direct calls to the Mnesia-specific functions. The
Mnesia-specific functions stay as they are to make the diff with the
Khepri integration branch easy to read.

Author: dumbbell

deps/rabbit/src/rabbit_db.erl

@@ -19,7 +19,6 @@
          is_virgin_node/0, is_virgin_node/1,
          dir/0,
          ensure_dir_exists/0]).
--export([run/1]).
 
 %% Exported to be used by various rabbit_db_* modules
 -export([
@@ -49,8 +48,7 @@ init() ->
 
     pre_init(IsVirgin),
 
-    Ret = run(
-            #{mnesia => fun init_using_mnesia/0}),
+    Ret = init_using_mnesia(),
     case Ret of
         ok ->
             ?LOG_DEBUG(
@@ -91,9 +89,8 @@ init_using_mnesia() ->
 %% @doc Resets the database and the node.
 
 reset() ->
-    Ret = run(
-            #{mnesia => fun reset_using_mnesia/0}),
-    post_reset(Ret).
+    ok = reset_using_mnesia(),
+    post_reset().
 
 reset_using_mnesia() ->
     ?LOG_INFO(
@@ -106,9 +103,8 @@ reset_using_mnesia() ->
 %% @doc Resets the database and the node.
 
 force_reset() ->
-    Ret = run(
-            #{mnesia => fun force_reset_using_mnesia/0}),
-    post_reset(Ret).
+    ok = force_reset_using_mnesia(),
+    post_reset().
 
 force_reset_using_mnesia() ->
     ?LOG_DEBUG(
@@ -124,20 +120,17 @@ force_reset_using_mnesia() ->
 %% state, like if critical members are MIA.
 
 force_load_on_next_boot() ->
-    run(
-      #{mnesia => fun force_load_on_next_boot_using_mnesia/0}).
+    force_load_on_next_boot_using_mnesia().
 
 force_load_on_next_boot_using_mnesia() ->
     ?LOG_DEBUG(
       "DB: force load on next boot (using Mnesia)",
       #{domain => ?RMQLOG_DOMAIN_DB}),
     rabbit_mnesia:force_load_next_boot().
 
-post_reset(ok) ->
+post_reset() ->
     rabbit_feature_flags:reset_registry(),
-    ok;
-post_reset({error, _} = Error) ->
-    Error.
+    ok.
 
 %% -------------------------------------------------------------------
 %% is_virgin_node().
@@ -152,8 +145,7 @@ post_reset({error, _} = Error) ->
 %% @see is_virgin_node/1.
 
 is_virgin_node() ->
-    run(
-      #{mnesia => fun is_virgin_node_using_mnesia/0}).
+    is_virgin_node_using_mnesia().
 
 is_virgin_node_using_mnesia() ->
     rabbit_mnesia:is_virgin_node().
@@ -186,8 +178,7 @@ is_virgin_node(Node) when is_atom(Node) ->
 %% @returns the directory path.
 
 dir() ->
-    run(
-      #{mnesia => fun mnesia_dir/0}).
+    mnesia_dir().
 
 mnesia_dir() ->
     rabbit_mnesia:dir().
@@ -207,26 +198,15 @@ ensure_dir_exists() ->
     end.
 
 %% -------------------------------------------------------------------
-%% run().
+%% list_in_mnesia().
 %% -------------------------------------------------------------------
 
--spec run(Funs) -> Ret when
-      Funs :: #{mnesia := Fun},
-      Fun :: fun(() -> Ret),
-      Ret :: any().
-%% @doc Runs the function corresponding to the used database engine.
-%%
-%% @returns the return value of `Fun'.
-
-run(Funs)
-  when is_map(Funs) andalso is_map_key(mnesia, Funs) ->
-    #{mnesia := MnesiaFun} = Funs,
-    run_using_mnesia(MnesiaFun).
-
-run_using_mnesia(Fun) ->
-    Fun().
+-spec list_in_mnesia(Table, Match) -> Objects when
+      Table :: atom(),
+      Match :: any(),
+      Objects :: [any()].
 
 list_in_mnesia(Table, Match) ->
-    %% Not dirty_match_object since that would not be transactional when used in a
-    %% tx context
+    %% Not dirty_match_object since that would not be transactional when used
+    %% in a tx context
     mnesia:async_dirty(fun () -> mnesia:match_object(Table, Match, read) end).

deps/rabbit/src/rabbit_db_binding.erl

@@ -55,9 +55,7 @@
 %% @private
 
 exists(Binding) ->
-    rabbit_db:run(
-      #{mnesia => fun() -> exists_in_mnesia(Binding) end
-       }).
+    exists_in_mnesia(Binding).
 
 exists_in_mnesia(Binding) ->
     binding_action_in_mnesia(
@@ -105,9 +103,7 @@ not_found_or_absent_errs_in_mnesia(Names) ->
 %% @private
 
 create(Binding, ChecksFun) ->
-    rabbit_db:run(
-      #{mnesia => fun() -> create_in_mnesia(Binding, ChecksFun) end
-       }).
+    create_in_mnesia(Binding, ChecksFun).
 
 create_in_mnesia(Binding, ChecksFun) ->
     binding_action_in_mnesia(
@@ -150,9 +146,7 @@ create_in_mnesia(Binding, ChecksFun) ->
 %% @private
 
 delete(Binding, ChecksFun) ->
-    rabbit_db:run(
-      #{mnesia => fun() -> delete_in_mnesia(Binding, ChecksFun) end
-       }).
+    delete_in_mnesia(Binding, ChecksFun).
 
 delete_in_mnesia(Binding, ChecksFun) ->
     binding_action_in_mnesia(
@@ -219,9 +213,7 @@ not_found_or_absent_in_mnesia(#resource{kind = queue}    = Name) ->
 %% @private
 
 get_all() ->
-    rabbit_db:run(
-      #{mnesia => fun() -> get_all_in_mnesia() end
-       }).
+    get_all_in_mnesia().
 
 get_all_in_mnesia() ->
     mnesia:async_dirty(
@@ -240,9 +232,7 @@ get_all_in_mnesia() ->
 %% @private
 
 get_all(VHost) ->
-    rabbit_db:run(
-      #{mnesia => fun() -> get_all_in_mnesia(VHost) end
-       }).
+    get_all_in_mnesia(VHost).
 
 get_all_in_mnesia(VHost) ->
     VHostResource = rabbit_misc:r(VHost, '_'),
@@ -265,9 +255,7 @@ get_all_in_mnesia(VHost) ->
 %% @private
 
 get_all(SrcName, DstName, Reverse) ->
-    rabbit_db:run(
-      #{mnesia => fun() -> get_all_in_mnesia(SrcName, DstName, Reverse) end
-       }).
+    get_all_in_mnesia(SrcName, DstName, Reverse).
 
 get_all_in_mnesia(SrcName, DstName, Reverse) ->
     Route = #route{binding = #binding{source      = SrcName,
@@ -290,9 +278,7 @@ get_all_in_mnesia(SrcName, DstName, Reverse) ->
 %% @private
 
 get_all_for_source(Resource) ->
-    rabbit_db:run(
-      #{mnesia => fun() -> get_all_for_source_in_mnesia(Resource) end
-       }).
+    get_all_for_source_in_mnesia(Resource).
 
 get_all_for_source_in_mnesia(Resource) ->
     Route = #route{binding = #binding{source = Resource, _ = '_'}},
@@ -326,9 +312,7 @@ list_for_route(Route, true) ->
 %% @private
 
 get_all_for_destination(Dst) ->
-    rabbit_db:run(
-      #{mnesia => fun() -> get_all_for_destination_in_mnesia(Dst) end
-       }).
+    get_all_for_destination_in_mnesia(Dst).
 
 get_all_for_destination_in_mnesia(Dst) ->
     Route = #route{binding = #binding{destination = Dst,
@@ -354,9 +338,7 @@ get_all_for_destination_in_mnesia(Dst) ->
 %% @private
 
 fold(Fun, Acc) ->
-    rabbit_db:run(
-      #{mnesia => fun() -> fold_in_mnesia(Fun, Acc) end
-       }).
+    fold_in_mnesia(Fun, Acc).
 
 fold_in_mnesia(Fun, Acc) ->
     ets:foldl(fun(#route{binding = Binding}, Acc0) ->
@@ -381,9 +363,7 @@ fold_in_mnesia(Fun, Acc) ->
 %% @private
 
 match(SrcName, Match) ->
-    rabbit_db:run(
-      #{mnesia => fun() -> match_in_mnesia(SrcName, Match) end
-       }).
+    match_in_mnesia(SrcName, Match).
 
 match_in_mnesia(SrcName, Match) ->
     MatchHead = #route{binding = #binding{source      = SrcName,
@@ -411,9 +391,7 @@ match_in_mnesia(SrcName, Match) ->
 %% @private
 
 match_routing_key(SrcName, RoutingKeys, UseIndex) ->
-    rabbit_db:run(
-      #{mnesia => fun() -> match_routing_key_in_mnesia(SrcName, RoutingKeys, UseIndex) end
-       }).
+    match_routing_key_in_mnesia(SrcName, RoutingKeys, UseIndex).
 
 match_routing_key_in_mnesia(SrcName, RoutingKeys, UseIndex) ->
     case UseIndex of
@@ -433,9 +411,7 @@ match_routing_key_in_mnesia(SrcName, RoutingKeys, UseIndex) ->
 %% @private
 
 recover() ->
-    rabbit_db:run(
-      #{mnesia => fun() -> recover_in_mnesia() end
-       }).
+    recover_in_mnesia().
 
 recover_in_mnesia() ->
     rabbit_mnesia:execute_mnesia_transaction(
@@ -462,15 +438,14 @@ recover_in_mnesia() ->
 %% @private
 
 recover(RecoverFun) ->
-    rabbit_db:run(
-      #{mnesia => fun() -> recover_in_mnesia(RecoverFun) end
-       }).
+    recover_in_mnesia(RecoverFun).
 
 recover_in_mnesia(RecoverFun) ->
-    [RecoverFun(Route, Src, Dst, fun recover_semi_durable_route/2) ||
-        #route{binding = #binding{destination = Dst,
-                                  source = Src}} = Route <-
-            rabbit_mnesia:dirty_read_all(?MNESIA_SEMI_DURABLE_TABLE)].
+    _ = [RecoverFun(Route, Src, Dst, fun recover_semi_durable_route/2) ||
+         #route{binding = #binding{destination = Dst,
+                                   source = Src}} = Route <-
+         rabbit_mnesia:dirty_read_all(?MNESIA_SEMI_DURABLE_TABLE)],
+    ok.
 
 %% -------------------------------------------------------------------
 %% delete_all_for_exchange_in_mnesia().
@@ -578,8 +553,7 @@ has_for_source_in_mnesia(SrcName) ->
 %% @private
 
 clear() ->
-    rabbit_db:run(
-      #{mnesia => fun() -> clear_in_mnesia() end}).
+    clear_in_mnesia().
 
 clear_in_mnesia() ->
     {atomic, ok} = mnesia:clear_table(?MNESIA_TABLE),

deps/rabbit/src/rabbit_db_cluster.erl

@@ -111,12 +111,7 @@ join_using_mnesia(ClusterNodes, NodeType) when is_list(ClusterNodes) ->
 forget_member(Node, RemoveWhenOffline) ->
     case rabbit:is_running(Node) of
         false ->
-            rabbit_db:run(
-              #{mnesia => fun() ->
-                                  forget_member_using_mnesia(
-                                    Node, RemoveWhenOffline)
-                          end
-               });
+            forget_member_using_mnesia(Node, RemoveWhenOffline);
         true ->
             {error, {failed_to_remove_node, Node, rabbit_still_running}}
     end.
@@ -135,8 +130,7 @@ forget_member_using_mnesia(Node, RemoveWhenOffline) ->
 %% Node types may not all be valid with all databases.
 
 change_node_type(NodeType) ->
-    rabbit_db:run(
-      #{mnesia => fun() -> change_node_type_using_mnesia(NodeType) end}).
+    change_node_type_using_mnesia(NodeType).
 
 change_node_type_using_mnesia(NodeType) ->
     rabbit_mnesia:change_cluster_node_type(NodeType).
@@ -150,8 +144,7 @@ change_node_type_using_mnesia(NodeType) ->
 %% @doc Indicates if this node is clustered with other nodes or not.
 
 is_clustered() ->
-    rabbit_db:run(
-      #{mnesia => fun is_clustered_using_mnesia/0}).
+    is_clustered_using_mnesia().
 
 is_clustered_using_mnesia() ->
     rabbit_mnesia:is_clustered().
@@ -161,8 +154,7 @@ is_clustered_using_mnesia() ->
 %% @doc Returns the list of cluster members.
 
 members() ->
-    rabbit_db:run(
-      #{mnesia => fun members_using_mnesia/0}).
+    members_using_mnesia().
 
 members_using_mnesia() ->
     rabbit_mnesia:members().
@@ -172,8 +164,7 @@ members_using_mnesia() ->
 %% @private
 
 disc_members() ->
-    rabbit_db:run(
-      #{mnesia => fun disc_members_using_mnesia/0}).
+    disc_members_using_mnesia().
 
 disc_members_using_mnesia() ->
     rabbit_mnesia:cluster_nodes(disc).
@@ -185,8 +176,7 @@ disc_members_using_mnesia() ->
 %% Node types may not all be relevant with all databases.
 
 node_type() ->
-    rabbit_db:run(
-      #{mnesia => fun node_type_using_mnesia/0}).
+    node_type_using_mnesia().
 
 node_type_using_mnesia() ->
     rabbit_mnesia:node_type().
@@ -200,9 +190,7 @@ node_type_using_mnesia() ->
 check_compatibility(RemoteNode) ->
     case rabbit_feature_flags:check_node_compatibility(RemoteNode) of
         ok ->
-            rabbit_db:run(
-              #{mnesia =>
-                fun() -> check_compatibility_using_mnesia(RemoteNode) end});
+            check_compatibility_using_mnesia(RemoteNode);
         Error ->
             Error
     end.
@@ -214,8 +202,7 @@ check_compatibility_using_mnesia(RemoteNode) ->
 %% @doc Ensures the cluster is consistent.
 
 check_consistency() ->
-    rabbit_db:run(
-      #{mnesia => fun check_consistency_using_mnesia/0}).
+    check_consistency_using_mnesia().
 
 check_consistency_using_mnesia() ->
     rabbit_mnesia:check_cluster_consistency().
@@ -228,8 +215,7 @@ check_consistency_using_mnesia() ->
 %% command.
 
 cli_cluster_status() ->
-    rabbit_db:run(
-      #{mnesia => fun cli_cluster_status_using_mnesia/0}).
+    cli_cluster_status_using_mnesia().
 
 cli_cluster_status_using_mnesia() ->
     rabbit_mnesia:status().