Skip to content

Commit 7192eb6

Browse files
dumbbellmergify[bot]
authored andcommitted
rabbit_khepri: Rename misleading delete() to delete_many()
[Why] This wrapper was calling `khepri:delete_many()`, not `khepri:delete()` as the name was suggesting. They are not the same function and have not the same behaviour. I did not identified any performance problem, but this is a similar naming issue as the one fixed by the previous commit. [How] The wrapper is renamed to reflect the Khepri API being called. While here, add a `rabbit_khepri:delete()` wrapper that calls the similarily named Khepri API. (cherry picked from commit 560b45b) (cherry picked from commit 174648e)
1 parent 9b883b2 commit 7192eb6

13 files changed

Lines changed: 27 additions & 19 deletions

deps/rabbit/src/rabbit_db_binding.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,7 @@ clear_in_khepri() ->
10421042
_Kind = ?KHEPRI_WILDCARD_STAR,
10431043
_DstName = ?KHEPRI_WILDCARD_STAR,
10441044
_RoutingKey = ?KHEPRI_WILDCARD_STAR),
1045-
case rabbit_khepri:delete(Path) of
1045+
case rabbit_khepri:delete_many(Path) of
10461046
ok -> ok;
10471047
Error -> throw(Error)
10481048
end.

deps/rabbit/src/rabbit_db_exchange.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -905,7 +905,7 @@ clear_exchange_serials_in_khepri() ->
905905
khepri_delete(Path).
906906

907907
khepri_delete(Path) ->
908-
case rabbit_khepri:delete(Path) of
908+
case rabbit_khepri:delete_many(Path) of
909909
ok -> ok;
910910
Error -> throw(Error)
911911
end.

deps/rabbit/src/rabbit_db_maintenance_m2k_converter.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ delete_from_khepri(rabbit_node_maintenance_states = Table, Key, State) ->
8989

9090
clear_data_in_khepri(rabbit_node_maintenance_states) ->
9191
Path = rabbit_db_maintenance:khepri_maintenance_path(?KHEPRI_WILDCARD_STAR),
92-
case rabbit_khepri:delete(Path) of
92+
case rabbit_khepri:delete_many(Path) of
9393
ok -> ok;
9494
Error -> throw(Error)
9595
end.

deps/rabbit/src/rabbit_db_msup.erl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,9 +296,9 @@ delete_all_in_khepri(Group) ->
296296
Pattern = #mirrored_sup_childspec{key = {Group, '_'},
297297
_ = '_'},
298298
Conditions = [?KHEPRI_WILDCARD_STAR_STAR, #if_data_matches{pattern = Pattern}],
299-
rabbit_khepri:delete(khepri_mirrored_supervisor_path(
300-
?KHEPRI_WILDCARD_STAR,
301-
#if_all{conditions = Conditions})).
299+
rabbit_khepri:delete_many(khepri_mirrored_supervisor_path(
300+
?KHEPRI_WILDCARD_STAR,
301+
#if_all{conditions = Conditions})).
302302

303303
%% -------------------------------------------------------------------
304304
%% clear().
@@ -319,7 +319,7 @@ clear_in_mnesia() ->
319319
clear_in_khepri() ->
320320
Path = khepri_mirrored_supervisor_path(
321321
?KHEPRI_WILDCARD_STAR, ?KHEPRI_WILDCARD_STAR_STAR),
322-
case rabbit_khepri:delete(Path) of
322+
case rabbit_khepri:delete_many(Path) of
323323
ok -> ok;
324324
Error -> throw(Error)
325325
end.

deps/rabbit/src/rabbit_db_queue.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1453,7 +1453,7 @@ clear_in_mnesia() ->
14531453

14541454
clear_in_khepri() ->
14551455
Path = khepri_queue_path(?KHEPRI_WILDCARD_STAR, ?KHEPRI_WILDCARD_STAR),
1456-
case rabbit_khepri:delete(Path) of
1456+
case rabbit_khepri:delete_many(Path) of
14571457
ok -> ok;
14581458
Error -> throw(Error)
14591459
end.

deps/rabbit/src/rabbit_db_rtparams.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ delete_matching_in_mnesia_tx(VHostName, Comp, Name) ->
311311

312312
delete_in_khepri(Key) ->
313313
Path = khepri_rp_path(Key),
314-
ok = rabbit_khepri:delete(Path).
314+
ok = rabbit_khepri:delete_many(Path).
315315

316316
delete_matching_in_khepri(VHostName, Comp, Name) ->
317317
Key = {?any(VHostName), ?any(Comp), ?any(Name)},

deps/rabbit/src/rabbit_db_rtparams_m2k_converter.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,15 @@ rtparams_path(Key) ->
9393

9494
clear_data_in_khepri(rabbit_runtime_parameters) ->
9595
Path1 = rabbit_db_rtparams:khepri_global_rp_path(?KHEPRI_WILDCARD_STAR),
96-
case rabbit_khepri:delete(Path1) of
96+
case rabbit_khepri:delete_many(Path1) of
9797
ok -> ok;
9898
Error1 -> throw(Error1)
9999
end,
100100
Path2 = rabbit_db_rtparams:khepri_vhost_rp_path(
101101
?KHEPRI_WILDCARD_STAR,
102102
?KHEPRI_WILDCARD_STAR,
103103
?KHEPRI_WILDCARD_STAR),
104-
case rabbit_khepri:delete(Path2) of
104+
case rabbit_khepri:delete_many(Path2) of
105105
ok -> ok;
106106
Error2 -> throw(Error2)
107107
end.

deps/rabbit/src/rabbit_db_user.erl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ clear_matching_user_permissions_in_mnesia_tx(Username, VHostName) ->
586586

587587
clear_matching_user_permissions_in_khepri(Username, VHostName) ->
588588
Path = khepri_user_permission_path(any(Username), any(VHostName)),
589-
ok = rabbit_khepri:delete(Path).
589+
ok = rabbit_khepri:delete_many(Path).
590590

591591
any('_') -> ?KHEPRI_WILDCARD_STAR;
592592
any(Value) -> Value.
@@ -955,7 +955,7 @@ clear_topic_permissions_in_mnesia_tx(Username, VHostName, ExchangeName) ->
955955

956956
clear_topic_permissions_in_khepri(Username, VHostName, ExchangeName) ->
957957
Path = khepri_topic_permission_path(any(Username), any(VHostName), any(ExchangeName)),
958-
rabbit_khepri:delete(Path).
958+
rabbit_khepri:delete_many(Path).
959959

960960
%% -------------------------------------------------------------------
961961
%% clear_matching_topic_permissions().
@@ -1011,7 +1011,7 @@ clear_matching_topic_permissions_in_khepri(
10111011
Username, VHostName, ExchangeName) ->
10121012
Path = khepri_topic_permission_path(
10131013
any(Username), any(VHostName), any(ExchangeName)),
1014-
ok = rabbit_khepri:delete(Path).
1014+
ok = rabbit_khepri:delete_many(Path).
10151015

10161016
%% -------------------------------------------------------------------
10171017
%% delete().
@@ -1105,7 +1105,7 @@ clear_in_mnesia() ->
11051105

11061106
clear_in_khepri() ->
11071107
Path = khepri_user_path(?KHEPRI_WILDCARD_STAR),
1108-
case rabbit_khepri:delete(Path) of
1108+
case rabbit_khepri:delete_many(Path) of
11091109
ok -> ok;
11101110
Error -> throw(Error)
11111111
end.

deps/rabbit/src/rabbit_db_vhost.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ clear_in_mnesia() ->
556556

557557
clear_in_khepri() ->
558558
Path = khepri_vhost_path(?KHEPRI_WILDCARD_STAR),
559-
case rabbit_khepri:delete(Path) of
559+
case rabbit_khepri:delete_many(Path) of
560560
ok -> ok;
561561
Error -> throw(Error)
562562
end.

deps/rabbit/src/rabbit_khepri.erl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@
155155
adv_update/2, adv_update/3,
156156

157157
delete/1, delete/2,
158+
delete_many/1, delete_many/2,
158159
adv_delete/1, adv_delete/2,
159160
adv_delete_many/1, adv_delete_many/2,
160161
clear_payload/1, clear_payload/2,
@@ -1256,6 +1257,13 @@ delete(PathPattern) ->
12561257
delete(PathPattern, #{}).
12571258

12581259
delete(PathPattern, Options) ->
1260+
Options1 = maps:merge(?DEFAULT_COMMAND_OPTIONS, Options),
1261+
khepri:delete(?STORE_ID, PathPattern, Options1).
1262+
1263+
delete_many(PathPattern) ->
1264+
delete_many(PathPattern, #{}).
1265+
1266+
delete_many(PathPattern, Options) ->
12591267
Options1 = maps:merge(?DEFAULT_COMMAND_OPTIONS, Options),
12601268
khepri:delete_many(?STORE_ID, PathPattern, Options1).
12611269

0 commit comments

Comments
 (0)