Merge pull request #15908 from rabbitmq/mergify/bp/v4.2.x/pr-15907

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

Author: dumbbell

deps/rabbit/src/rabbit_db_binding.erl

@@ -1042,7 +1042,7 @@ clear_in_khepri() ->
              _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

@@ -905,7 +905,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

@@ -89,7 +89,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

@@ -296,9 +296,9 @@ delete_all_in_khepri(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().
@@ -319,7 +319,7 @@ clear_in_mnesia() ->
 clear_in_khepri() ->
     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

@@ -1453,7 +1453,7 @@ clear_in_mnesia() ->
 
 clear_in_khepri() ->
     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

@@ -311,7 +311,7 @@ delete_matching_in_mnesia_tx(VHostName, Comp, Name) ->
 
 delete_in_khepri(Key) ->
     Path = khepri_rp_path(Key),
-    ok = rabbit_khepri:delete(Path).
+    ok = rabbit_khepri:delete_many(Path).
 
 delete_matching_in_khepri(VHostName, Comp, Name) ->
     Key = {?any(VHostName), ?any(Comp), ?any(Name)},
@@ -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(Pattern) of
+    case rabbit_khepri:adv_delete_many(Pattern) of
         {ok, NodePropsMap} ->
             RTParams =
             maps:fold(

deps/rabbit/src/rabbit_db_rtparams_m2k_converter.erl

@@ -93,15 +93,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

@@ -586,7 +586,7 @@ clear_matching_user_permissions_in_mnesia_tx(Username, VHostName) ->
 
 clear_matching_user_permissions_in_khepri(Username, 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.
@@ -955,7 +955,7 @@ clear_topic_permissions_in_mnesia_tx(Username, VHostName, ExchangeName) ->
 
 clear_topic_permissions_in_khepri(Username, VHostName, 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().
@@ -1011,7 +1011,7 @@ clear_matching_topic_permissions_in_khepri(
   Username, VHostName, ExchangeName) ->
     Path = khepri_topic_permission_path(
              any(Username), any(VHostName), any(ExchangeName)),
-    ok = rabbit_khepri:delete(Path).
+    ok = rabbit_khepri:delete_many(Path).
 
 %% -------------------------------------------------------------------
 %% delete().
@@ -1105,7 +1105,7 @@ clear_in_mnesia() ->
 
 clear_in_khepri() ->
     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

@@ -556,7 +556,7 @@ clear_in_mnesia() ->
 
 clear_in_khepri() ->
     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,
@@ -1255,13 +1257,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).