root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Consistently use singular names for Khepri projections 

Previously about half of the Khepri projection names were pluralized.
This commit is contained in:
Michael Davis 2024-09-10 10:37:36 -04:00
parent 43b7fc1e53
commit c363ae0add
No known key found for this signature in database
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/rabbit/src/rabbit_db_binding.erl vendored
View File

@ -53,7 +53,7 @@
-define(MNESIA_SEMI_DURABLE_TABLE, rabbit_semi_durable_route). -define(MNESIA_SEMI_DURABLE_TABLE, rabbit_semi_durable_route).
-define(MNESIA_REVERSE_TABLE, rabbit_reverse_route). -define(MNESIA_REVERSE_TABLE, rabbit_reverse_route).
-define(MNESIA_INDEX_TABLE, rabbit_index_route). -define(MNESIA_INDEX_TABLE, rabbit_index_route).
-define(KHEPRI_BINDINGS_PROJECTION, rabbit_khepri_bindings). -define(KHEPRI_BINDINGS_PROJECTION, rabbit_khepri_binding).
-define(KHEPRI_INDEX_ROUTE_PROJECTION, rabbit_khepri_index_route). -define(KHEPRI_INDEX_ROUTE_PROJECTION, rabbit_khepri_index_route).
%% ------------------------------------------------------------------- %% -------------------------------------------------------------------

4
deps/rabbit/src/rabbit_db_rtparams.erl vendored
View File

@ -23,8 +23,8 @@
]). ]).
-define(MNESIA_TABLE, rabbit_runtime_parameters). -define(MNESIA_TABLE, rabbit_runtime_parameters).
-define(KHEPRI_GLOBAL_PROJECTION, rabbit_khepri_global_rtparams). -define(KHEPRI_GLOBAL_PROJECTION, rabbit_khepri_global_rtparam).
-define(KHEPRI_VHOST_PROJECTION, rabbit_khepri_per_vhost_rtparams). -define(KHEPRI_VHOST_PROJECTION, rabbit_khepri_per_vhost_rtparam).
-define(any(Value), case Value of -define(any(Value), case Value of
'_' -> ?KHEPRI_WILDCARD_STAR; '_' -> ?KHEPRI_WILDCARD_STAR;
_ -> Value _ -> Value

4
deps/rabbit/src/rabbit_db_user.erl vendored
View File

@ -75,8 +75,8 @@
-define(MNESIA_TABLE, rabbit_user). -define(MNESIA_TABLE, rabbit_user).
-define(PERM_MNESIA_TABLE, rabbit_user_permission). -define(PERM_MNESIA_TABLE, rabbit_user_permission).
-define(TOPIC_PERM_MNESIA_TABLE, rabbit_topic_permission). -define(TOPIC_PERM_MNESIA_TABLE, rabbit_topic_permission).
-define(KHEPRI_USERS_PROJECTION, rabbit_khepri_users). -define(KHEPRI_USERS_PROJECTION, rabbit_khepri_user).
-define(KHEPRI_PERMISSIONS_PROJECTION, rabbit_khepri_user_permissions). -define(KHEPRI_PERMISSIONS_PROJECTION, rabbit_khepri_user_permission).
%% ------------------------------------------------------------------- %% -------------------------------------------------------------------
%% create(). %% create().

10
deps/rabbit/src/rabbit_khepri.erl vendored
View File

@ -1190,21 +1190,21 @@ register_rabbit_vhost_projection() ->
register_simple_projection(Name, PathPattern, KeyPos). register_simple_projection(Name, PathPattern, KeyPos).
register_rabbit_users_projection() -> register_rabbit_users_projection() ->
Name = rabbit_khepri_users, Name = rabbit_khepri_user,
PathPattern = rabbit_db_user:khepri_user_path( PathPattern = rabbit_db_user:khepri_user_path(
_UserName = ?KHEPRI_WILDCARD_STAR), _UserName = ?KHEPRI_WILDCARD_STAR),
KeyPos = 2, %% #internal_user.username KeyPos = 2, %% #internal_user.username
register_simple_projection(Name, PathPattern, KeyPos). register_simple_projection(Name, PathPattern, KeyPos).
register_rabbit_global_runtime_parameters_projection() -> register_rabbit_global_runtime_parameters_projection() ->
Name = rabbit_khepri_global_rtparams, Name = rabbit_khepri_global_rtparam,
PathPattern = rabbit_db_rtparams:khepri_global_rp_path( PathPattern = rabbit_db_rtparams:khepri_global_rp_path(
_Key = ?KHEPRI_WILDCARD_STAR_STAR), _Key = ?KHEPRI_WILDCARD_STAR_STAR),
KeyPos = #runtime_parameters.key, KeyPos = #runtime_parameters.key,
register_simple_projection(Name, PathPattern, KeyPos). register_simple_projection(Name, PathPattern, KeyPos).
register_rabbit_per_vhost_runtime_parameters_projection() -> register_rabbit_per_vhost_runtime_parameters_projection() ->
Name = rabbit_khepri_per_vhost_rtparams, Name = rabbit_khepri_per_vhost_rtparam,
PathPattern = rabbit_db_rtparams:khepri_vhost_rp_path( PathPattern = rabbit_db_rtparams:khepri_vhost_rp_path(
_VHost = ?KHEPRI_WILDCARD_STAR_STAR, _VHost = ?KHEPRI_WILDCARD_STAR_STAR,
_Component = ?KHEPRI_WILDCARD_STAR_STAR, _Component = ?KHEPRI_WILDCARD_STAR_STAR,
@ -1213,7 +1213,7 @@ register_rabbit_per_vhost_runtime_parameters_projection() ->
register_simple_projection(Name, PathPattern, KeyPos). register_simple_projection(Name, PathPattern, KeyPos).
register_rabbit_user_permissions_projection() -> register_rabbit_user_permissions_projection() ->
Name = rabbit_khepri_user_permissions, Name = rabbit_khepri_user_permission,
PathPattern = rabbit_db_user:khepri_user_permission_path( PathPattern = rabbit_db_user:khepri_user_permission_path(
_UserName = ?KHEPRI_WILDCARD_STAR, _UserName = ?KHEPRI_WILDCARD_STAR,
_VHost = ?KHEPRI_WILDCARD_STAR), _VHost = ?KHEPRI_WILDCARD_STAR),
@ -1232,7 +1232,7 @@ register_rabbit_bindings_projection() ->
ProjectionFun = projection_fun_for_sets(MapFun), ProjectionFun = projection_fun_for_sets(MapFun),
Options = #{keypos => #route.binding}, Options = #{keypos => #route.binding},
Projection = khepri_projection:new( Projection = khepri_projection:new(
rabbit_khepri_bindings, ProjectionFun, Options), rabbit_khepri_binding, ProjectionFun, Options),
PathPattern = rabbit_db_binding:khepri_route_path( PathPattern = rabbit_db_binding:khepri_route_path(
_VHost = ?KHEPRI_WILDCARD_STAR, _VHost = ?KHEPRI_WILDCARD_STAR,
_ExchangeName = ?KHEPRI_WILDCARD_STAR, _ExchangeName = ?KHEPRI_WILDCARD_STAR,