Merge pull request #15907 from rabbitmq/mergify/bp/v4.3.x/pr-15845

Fix `rabbit_khepri` delete-related wrappers (backport #15845)

Author: dumbbell

deps/rabbit/src/rabbit_db_binding.erl

@@ -616,7 +616,7 @@ clear() ->
              _Kind = ?KHEPRI_WILDCARD_STAR,
              _DstName = ?KHEPRI_WILDCARD_STAR,
              _RoutingKey = ?KHEPRI_WILDCARD_STAR),
-    case rabbit_khepri:delete(Path) of
+    case rabbit_khepri:delete_many(Path) of
         ok -> ok;
         Error -> throw(Error)
     end.

deps/rabbit/src/rabbit_db_exchange.erl

@@ -585,7 +585,7 @@ clear_exchange_serials_in_khepri() ->
     khepri_delete(Path).
 
 khepri_delete(Path) ->
-    case rabbit_khepri:delete(Path) of
+    case rabbit_khepri:delete_many(Path) of
         ok -> ok;
         Error -> throw(Error)
     end.

deps/rabbit/src/rabbit_db_maintenance_m2k_converter.erl

@@ -86,7 +86,7 @@ delete_from_khepri(rabbit_node_maintenance_states = Table, Key, State) ->
 
 clear_data_in_khepri(rabbit_node_maintenance_states) ->
     Path = rabbit_db_maintenance:khepri_maintenance_path(?KHEPRI_WILDCARD_STAR),
-    case rabbit_khepri:delete(Path) of
+    case rabbit_khepri:delete_many(Path) of
         ok -> ok;
         Error -> throw(Error)
     end.

deps/rabbit/src/rabbit_db_msup.erl

@@ -140,9 +140,9 @@ delete_all(Group) ->
     Pattern = #mirrored_sup_childspec{key = {Group, '_'},
                                       _   = '_'},
     Conditions = [?KHEPRI_WILDCARD_STAR_STAR, #if_data_matches{pattern = Pattern}],
-    rabbit_khepri:delete(khepri_mirrored_supervisor_path(
-                           ?KHEPRI_WILDCARD_STAR,
-                           #if_all{conditions = Conditions})).
+    rabbit_khepri:delete_many(khepri_mirrored_supervisor_path(
+                                ?KHEPRI_WILDCARD_STAR,
+                                #if_all{conditions = Conditions})).
 
 %% -------------------------------------------------------------------
 %% clear().
@@ -153,7 +153,7 @@ delete_all(Group) ->
 clear() ->
     Path = khepri_mirrored_supervisor_path(
              ?KHEPRI_WILDCARD_STAR, ?KHEPRI_WILDCARD_STAR_STAR),
-    case rabbit_khepri:delete(Path) of
+    case rabbit_khepri:delete_many(Path) of
         ok -> ok;
         Error -> throw(Error)
     end.

deps/rabbit/src/rabbit_db_queue.erl

@@ -951,7 +951,7 @@ get_in_khepri_tx(Name) ->
 
 clear() ->
     Path = khepri_queue_path(?KHEPRI_WILDCARD_STAR, ?KHEPRI_WILDCARD_STAR),
-    case rabbit_khepri:delete(Path) of
+    case rabbit_khepri:delete_many(Path) of
         ok -> ok;
         Error -> throw(Error)
     end.

deps/rabbit/src/rabbit_db_rtparams.erl

@@ -219,7 +219,7 @@ delete(VHostName, Comp, Name)
 
 do_delete(Key) ->
     Path = khepri_rp_path(Key),
-    ok = rabbit_khepri:delete(Path).
+    ok = rabbit_khepri:delete_many(Path).
 
 %% -------------------------------------------------------------------
 %% delete_vhost().
@@ -239,7 +239,7 @@ do_delete(Key) ->
 delete_vhost(VHostName) when is_binary(VHostName) ->
     Pattern = khepri_vhost_rp_path(
                 VHostName, ?KHEPRI_WILDCARD_STAR, ?KHEPRI_WILDCARD_STAR),
-    case rabbit_khepri:adv_delete(Pattern) of
+    case rabbit_khepri:adv_delete_many(Pattern) of
         {ok, NodePropsMap} ->
             RTParams =
             maps:fold(

deps/rabbit/src/rabbit_db_rtparams_m2k_converter.erl

@@ -90,15 +90,15 @@ rtparams_path(Key) ->
 
 clear_data_in_khepri(rabbit_runtime_parameters) ->
     Path1 = rabbit_db_rtparams:khepri_global_rp_path(?KHEPRI_WILDCARD_STAR),
-    case rabbit_khepri:delete(Path1) of
+    case rabbit_khepri:delete_many(Path1) of
         ok -> ok;
         Error1 -> throw(Error1)
     end,
     Path2 = rabbit_db_rtparams:khepri_vhost_rp_path(
               ?KHEPRI_WILDCARD_STAR,
               ?KHEPRI_WILDCARD_STAR,
               ?KHEPRI_WILDCARD_STAR),
-    case rabbit_khepri:delete(Path2) of
+    case rabbit_khepri:delete_many(Path2) of
         ok -> ok;
         Error2 -> throw(Error2)
     end.

deps/rabbit/src/rabbit_db_user.erl

@@ -336,7 +336,7 @@ clear_matching_user_permissions(Username, VHostName)
   when (is_binary(Username) orelse Username =:= '_') andalso
        (is_binary(VHostName) orelse VHostName =:= '_') ->
     Path = khepri_user_permission_path(any(Username), any(VHostName)),
-    ok = rabbit_khepri:delete(Path).
+    ok = rabbit_khepri:delete_many(Path).
 
 any('_') -> ?KHEPRI_WILDCARD_STAR;
 any(Value) -> Value.
@@ -553,7 +553,7 @@ clear_topic_permissions(Username, VHostName, ExchangeName)
   when is_binary(Username) andalso is_binary(VHostName) andalso
        (is_binary(ExchangeName) orelse ExchangeName =:= '_') ->
     Path = khepri_topic_permission_path(any(Username), any(VHostName), any(ExchangeName)),
-    rabbit_khepri:delete(Path).
+    rabbit_khepri:delete_many(Path).
 
 %% -------------------------------------------------------------------
 %% clear_matching_topic_permissions().
@@ -575,7 +575,7 @@ clear_matching_topic_permissions(Username, VHostName, ExchangeName)
        (is_binary(ExchangeName) orelse ExchangeName =:= '_') ->
     Path = khepri_topic_permission_path(
              any(Username), any(VHostName), any(ExchangeName)),
-    ok = rabbit_khepri:delete(Path).
+    ok = rabbit_khepri:delete_many(Path).
 
 %% -------------------------------------------------------------------
 %% delete().
@@ -610,7 +610,7 @@ delete(Username) when is_binary(Username) ->
 
 clear() ->
     Path = khepri_user_path(?KHEPRI_WILDCARD_STAR),
-    case rabbit_khepri:delete(Path) of
+    case rabbit_khepri:delete_many(Path) of
         ok    -> ok;
         Error -> throw(Error)
     end.

deps/rabbit/src/rabbit_db_vhost.erl

@@ -367,7 +367,7 @@ delete(VHostName) when is_binary(VHostName) ->
 
 clear() ->
     Path = khepri_vhost_path(?KHEPRI_WILDCARD_STAR),
-    case rabbit_khepri:delete(Path) of
+    case rabbit_khepri:delete_many(Path) of
         ok    -> ok;
         Error -> throw(Error)
     end.

deps/rabbit/src/rabbit_khepri.erl

@@ -155,7 +155,9 @@
          adv_update/2, adv_update/3,
 
          delete/1, delete/2,
+         delete_many/1, delete_many/2,
          adv_delete/1, adv_delete/2,
+         adv_delete_many/1, adv_delete_many/2,
          clear_payload/1, clear_payload/2,
 
          transaction/1, transaction/2, transaction/3,
@@ -1244,13 +1246,27 @@ delete(PathPattern) ->
     delete(PathPattern, #{}).
 
 delete(PathPattern, Options) ->
+    Options1 = maps:merge(?DEFAULT_COMMAND_OPTIONS, Options),
+    khepri:delete(?STORE_ID, PathPattern, Options1).
+
+delete_many(PathPattern) ->
+    delete_many(PathPattern, #{}).
+
+delete_many(PathPattern, Options) ->
     Options1 = maps:merge(?DEFAULT_COMMAND_OPTIONS, Options),
     khepri:delete_many(?STORE_ID, PathPattern, Options1).
 
 adv_delete(PathPattern) ->
     adv_delete(PathPattern, #{}).
 
 adv_delete(PathPattern, Options) ->
+    Options1 = maps:merge(?DEFAULT_COMMAND_OPTIONS, Options),
+    khepri_adv:delete(?STORE_ID, PathPattern, Options1).
+
+adv_delete_many(PathPattern) ->
+    adv_delete_many(PathPattern, #{}).
+
+adv_delete_many(PathPattern, Options) ->
     Options1 = maps:merge(?DEFAULT_COMMAND_OPTIONS, Options),
     khepri_adv:delete_many(?STORE_ID, PathPattern, Options1).