Merge pull request #13781 from rabbitmq/cleanup-rabbit_khepri

Khepri: Clean up the setup/clustering code of the integration code

Author: dumbbell

deps/rabbit/src/rabbit_db.erl

@@ -328,7 +328,7 @@ list_in_khepri(Path) ->
       Objects :: [term()].
 
 list_in_khepri(Path, Options) ->
-    case rabbit_khepri:match(Path, Options) of
+    case rabbit_khepri:get_many(Path, Options) of
         {ok, Map} -> maps:values(Map);
         _         -> []
     end.

deps/rabbit/src/rabbit_db_cluster.erl

@@ -279,7 +279,7 @@ forget_member_using_khepri(_Node, true) ->
        #{domain => ?RMQLOG_DOMAIN_DB}),
     {error, not_supported};
 forget_member_using_khepri(Node, false = _RemoveWhenOffline) ->
-    rabbit_khepri:leave_cluster(Node).
+    rabbit_khepri:remove_member(Node).
 
 %% -------------------------------------------------------------------
 %% Cluster update.

deps/rabbit/src/rabbit_db_rtparams.erl

@@ -357,7 +357,7 @@ delete_vhost_in_mnesia_tx(VHostName) ->
 delete_vhost_in_khepri(VHostName) ->
     Pattern = khepri_vhost_rp_path(
                 VHostName, ?KHEPRI_WILDCARD_STAR, ?KHEPRI_WILDCARD_STAR),
-    case rabbit_khepri:adv_delete_many(Pattern) of
+    case rabbit_khepri:adv_delete(Pattern) of
         {ok, NodePropsMap} ->
             RTParams =
             maps:fold(

deps/rabbit/src/rabbit_db_user.erl

@@ -402,7 +402,7 @@ match_user_permissions_in_mnesia_tx(Username, VHostName) ->
 
 match_user_permissions_in_khepri('_' = _Username, '_' = _VHostName) ->
     Path = khepri_user_permission_path(?KHEPRI_WILDCARD_STAR, ?KHEPRI_WILDCARD_STAR),
-    case rabbit_khepri:match(Path) of
+    case rabbit_khepri:get_many(Path) of
         {ok, Map} ->
             maps:values(Map);
         _ ->