Skip to content

Commit 174648e

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)
1 parent 77cdf87 commit 174648e

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
@@ -616,7 +616,7 @@ clear() ->
616616
_Kind = ?KHEPRI_WILDCARD_STAR,
617617
_DstName = ?KHEPRI_WILDCARD_STAR,
618618
_RoutingKey = ?KHEPRI_WILDCARD_STAR),
619-
case rabbit_khepri:delete(Path) of
619+
case rabbit_khepri:delete_many(Path) of
620620
ok -> ok;
621621
Error -> throw(Error)
622622
end.

deps/rabbit/src/rabbit_db_exchange.erl

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

587587
khepri_delete(Path) ->
588-
case rabbit_khepri:delete(Path) of
588+
case rabbit_khepri:delete_many(Path) of
589589
ok -> ok;
590590
Error -> throw(Error)
591591
end.

deps/rabbit/src/rabbit_db_maintenance_m2k_converter.erl

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

8787
clear_data_in_khepri(rabbit_node_maintenance_states) ->
8888
Path = rabbit_db_maintenance:khepri_maintenance_path(?KHEPRI_WILDCARD_STAR),
89-
case rabbit_khepri:delete(Path) of
89+
case rabbit_khepri:delete_many(Path) of
9090
ok -> ok;
9191
Error -> throw(Error)
9292
end.

deps/rabbit/src/rabbit_db_msup.erl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ delete_all(Group) ->
140140
Pattern = #mirrored_sup_childspec{key = {Group, '_'},
141141
_ = '_'},
142142
Conditions = [?KHEPRI_WILDCARD_STAR_STAR, #if_data_matches{pattern = Pattern}],
143-
rabbit_khepri:delete(khepri_mirrored_supervisor_path(
144-
?KHEPRI_WILDCARD_STAR,
145-
#if_all{conditions = Conditions})).
143+
rabbit_khepri:delete_many(khepri_mirrored_supervisor_path(
144+
?KHEPRI_WILDCARD_STAR,
145+
#if_all{conditions = Conditions})).
146146

147147
%% -------------------------------------------------------------------
148148
%% clear().
@@ -153,7 +153,7 @@ delete_all(Group) ->
153153
clear() ->
154154
Path = khepri_mirrored_supervisor_path(
155155
?KHEPRI_WILDCARD_STAR, ?KHEPRI_WILDCARD_STAR_STAR),
156-
case rabbit_khepri:delete(Path) of
156+
case rabbit_khepri:delete_many(Path) of
157157
ok -> ok;
158158
Error -> throw(Error)
159159
end.

deps/rabbit/src/rabbit_db_queue.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,7 @@ get_in_khepri_tx(Name) ->
951951

952952
clear() ->
953953
Path = khepri_queue_path(?KHEPRI_WILDCARD_STAR, ?KHEPRI_WILDCARD_STAR),
954-
case rabbit_khepri:delete(Path) of
954+
case rabbit_khepri:delete_many(Path) of
955955
ok -> ok;
956956
Error -> throw(Error)
957957
end.

deps/rabbit/src/rabbit_db_rtparams.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ delete(VHostName, Comp, Name)
219219

220220
do_delete(Key) ->
221221
Path = khepri_rp_path(Key),
222-
ok = rabbit_khepri:delete(Path).
222+
ok = rabbit_khepri:delete_many(Path).
223223

224224
%% -------------------------------------------------------------------
225225
%% delete_vhost().

deps/rabbit/src/rabbit_db_rtparams_m2k_converter.erl

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

9191
clear_data_in_khepri(rabbit_runtime_parameters) ->
9292
Path1 = rabbit_db_rtparams:khepri_global_rp_path(?KHEPRI_WILDCARD_STAR),
93-
case rabbit_khepri:delete(Path1) of
93+
case rabbit_khepri:delete_many(Path1) of
9494
ok -> ok;
9595
Error1 -> throw(Error1)
9696
end,
9797
Path2 = rabbit_db_rtparams:khepri_vhost_rp_path(
9898
?KHEPRI_WILDCARD_STAR,
9999
?KHEPRI_WILDCARD_STAR,
100100
?KHEPRI_WILDCARD_STAR),
101-
case rabbit_khepri:delete(Path2) of
101+
case rabbit_khepri:delete_many(Path2) of
102102
ok -> ok;
103103
Error2 -> throw(Error2)
104104
end.

deps/rabbit/src/rabbit_db_user.erl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ clear_matching_user_permissions(Username, VHostName)
336336
when (is_binary(Username) orelse Username =:= '_') andalso
337337
(is_binary(VHostName) orelse VHostName =:= '_') ->
338338
Path = khepri_user_permission_path(any(Username), any(VHostName)),
339-
ok = rabbit_khepri:delete(Path).
339+
ok = rabbit_khepri:delete_many(Path).
340340

341341
any('_') -> ?KHEPRI_WILDCARD_STAR;
342342
any(Value) -> Value.
@@ -553,7 +553,7 @@ clear_topic_permissions(Username, VHostName, ExchangeName)
553553
when is_binary(Username) andalso is_binary(VHostName) andalso
554554
(is_binary(ExchangeName) orelse ExchangeName =:= '_') ->
555555
Path = khepri_topic_permission_path(any(Username), any(VHostName), any(ExchangeName)),
556-
rabbit_khepri:delete(Path).
556+
rabbit_khepri:delete_many(Path).
557557

558558
%% -------------------------------------------------------------------
559559
%% clear_matching_topic_permissions().
@@ -575,7 +575,7 @@ clear_matching_topic_permissions(Username, VHostName, ExchangeName)
575575
(is_binary(ExchangeName) orelse ExchangeName =:= '_') ->
576576
Path = khepri_topic_permission_path(
577577
any(Username), any(VHostName), any(ExchangeName)),
578-
ok = rabbit_khepri:delete(Path).
578+
ok = rabbit_khepri:delete_many(Path).
579579

580580
%% -------------------------------------------------------------------
581581
%% delete().
@@ -610,7 +610,7 @@ delete(Username) when is_binary(Username) ->
610610

611611
clear() ->
612612
Path = khepri_user_path(?KHEPRI_WILDCARD_STAR),
613-
case rabbit_khepri:delete(Path) of
613+
case rabbit_khepri:delete_many(Path) of
614614
ok -> ok;
615615
Error -> throw(Error)
616616
end.

deps/rabbit/src/rabbit_db_vhost.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ delete(VHostName) when is_binary(VHostName) ->
367367

368368
clear() ->
369369
Path = khepri_vhost_path(?KHEPRI_WILDCARD_STAR),
370-
case rabbit_khepri:delete(Path) of
370+
case rabbit_khepri:delete_many(Path) of
371371
ok -> ok;
372372
Error -> throw(Error)
373373
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,
@@ -1245,6 +1246,13 @@ delete(PathPattern) ->
12451246
delete(PathPattern, #{}).
12461247

12471248
delete(PathPattern, Options) ->
1249+
Options1 = maps:merge(?DEFAULT_COMMAND_OPTIONS, Options),
1250+
khepri:delete(?STORE_ID, PathPattern, Options1).
1251+
1252+
delete_many(PathPattern) ->
1253+
delete_many(PathPattern, #{}).
1254+
1255+
delete_many(PathPattern, Options) ->
12481256
Options1 = maps:merge(?DEFAULT_COMMAND_OPTIONS, Options),
12491257
khepri:delete_many(?STORE_ID, PathPattern, Options1).
12501258

0 commit comments

Comments
 (0)