Merge pull request #15693 from rabbitmq/cleanups-after-mnesia-code-removal

Binding code cleanup after Mnesia code removal

Author: dumbbell

deps/rabbit/include/rabbit_khepri.hrl

@@ -56,9 +56,9 @@
         ?RABBITMQ_KHEPRI_EXCHANGE_PATH(
           VHost, Exchange, [user_permissions, Username])).
 
--define(RABBITMQ_KHEPRI_ROUTE_PATH(VHost, SrcName, Kind, DstName, RoutingKey),
+-define(RABBITMQ_KHEPRI_ROUTE_PATH(VHost, SrcName, Kind, DstName, BindingKey),
         ?RABBITMQ_KHEPRI_EXCHANGE_PATH(
-          VHost, SrcName, [bindings, Kind, DstName, RoutingKey])).
+          VHost, SrcName, [bindings, Kind, DstName, BindingKey])).
 
 -define(RABBITMQ_KHEPRI_QUEUE_PATH(VHost, Name),
         ?RABBITMQ_KHEPRI_VHOST_PATH(VHost, [queues, Name])).

deps/rabbit/src/rabbit_db_binding.erl

@@ -635,11 +635,11 @@ khepri_route_path(
            key = RoutingKey}) ->
     khepri_route_path(VHost, SrcName, Kind, DstName, RoutingKey).
 
-khepri_route_path(VHost, SrcName, Kind, DstName, RoutingKey)
+khepri_route_path(VHost, SrcName, Kind, DstName, BindingKey)
   when ?IS_KHEPRI_PATH_CONDITION(Kind) andalso
        ?IS_KHEPRI_PATH_CONDITION(DstName) andalso
-       ?IS_KHEPRI_PATH_CONDITION(RoutingKey) ->
-    ?RABBITMQ_KHEPRI_ROUTE_PATH(VHost, SrcName, Kind, DstName, RoutingKey).
+       ?IS_KHEPRI_PATH_CONDITION(BindingKey) ->
+    ?RABBITMQ_KHEPRI_ROUTE_PATH(VHost, SrcName, Kind, DstName, BindingKey).
 
 khepri_route_path_to_args(Path) ->
     Pattern = khepri_route_path(

deps/rabbit/src/rabbit_db_topic_exchange.erl

@@ -9,16 +9,10 @@
 
 -include_lib("rabbit_common/include/rabbit.hrl").
 
--export([set/1, delete_all_for_exchange/1, delete/1, match/3]).
+-export([match/3]).
 
 %% Used by Khepri projections and the Mnesia-to-Khepri migration.
--export([
-         split_topic_key/1,
-         split_topic_key_binary/1
-        ]).
-
-%% For testing
--export([clear/0]).
+-export([split_topic_key_binary/1]).
 
 -define(KHEPRI_PROJECTION, rabbit_khepri_topic_trie_v3).
 
@@ -27,49 +21,6 @@
 
 -define(COMPILED_TOPIC_SPLIT_PATTERN, cp_dot).
 
-%% -------------------------------------------------------------------
-%% set().
-%% -------------------------------------------------------------------
-
--spec set(Binding) -> ok when
-      Binding :: rabbit_types:binding().
-%% @doc Sets a topic binding.
-%%
-%% @private
-
-set(#binding{}) ->
-    ok.
-
-%% -------------------------------------------------------------------
-%% delete_all_for_exchange().
-%% -------------------------------------------------------------------
-
--spec delete_all_for_exchange(ExchangeName) -> ok when
-      ExchangeName :: rabbit_exchange:name().
-%% @doc Deletes all topic bindings for the exchange named `ExchangeName'
-%%
-%% @private
-
-delete_all_for_exchange(_XName) ->
-    ok.
-
-%% -------------------------------------------------------------------
-%% delete().
-%% -------------------------------------------------------------------
-
--spec delete([Binding]) -> ok when
-      Binding :: rabbit_types:binding().
-%% @doc Deletes all given topic bindings
-%%
-%% @private
-
-delete(Bs) when is_list(Bs) ->
-    ok.
-
-%% -------------------------------------------------------------------
-%% match().
-%% -------------------------------------------------------------------
-
 -spec match(rabbit_exchange:name(),
             rabbit_types:routing_key(),
             rabbit_exchange:route_opts()) -> match_result().
@@ -85,38 +36,6 @@ match(XName, RoutingKey, Opts) ->
     Words = split_topic_key_binary(RoutingKey),
     trie_match_in_khepri(XName, Words, BKeys).
 
-%% -------------------------------------------------------------------
-%% clear().
-%% -------------------------------------------------------------------
-
--spec clear() -> ok.
-%% @doc Deletes all topic bindings
-%%
-%% @private
-
-clear() ->
-    ok.
-
-%% --------------------------------------------------------------
-%% split_topic_key().
-%% --------------------------------------------------------------
-
--spec split_topic_key(RoutingKey) -> Words when
-      RoutingKey :: binary(),
-      Words :: [[byte()]].
-
-split_topic_key(Key) ->
-    split_topic_key(Key, [], []).
-
-split_topic_key(<<>>, [], []) ->
-    [];
-split_topic_key(<<>>, RevWordAcc, RevResAcc) ->
-    lists:reverse([lists:reverse(RevWordAcc) | RevResAcc]);
-split_topic_key(<<$., Rest/binary>>, RevWordAcc, RevResAcc) ->
-    split_topic_key(Rest, [], [lists:reverse(RevWordAcc) | RevResAcc]);
-split_topic_key(<<C:8, Rest/binary>>, RevWordAcc, RevResAcc) ->
-    split_topic_key(Rest, [C | RevWordAcc], RevResAcc).
-
 %% --------------------------------------------------------------
 %% split_topic_key_binary().
 %% --------------------------------------------------------------

deps/rabbit/src/rabbit_exchange_type_topic.erl

@@ -43,22 +43,26 @@ route(#exchange{name = XName}, Msg, Opts) ->
     RKeys = mc:routing_keys(Msg),
     lists:append([rabbit_db_topic_exchange:match(XName, RKey, Opts) || RKey <- RKeys]).
 
-validate(_X) -> ok.
-validate_binding(_X, _B) -> ok.
-create(_Serial, _X) -> ok.
+validate(_X) ->
+    ok.
 
-delete(_Serial, #exchange{name = X}) ->
-    rabbit_db_topic_exchange:delete_all_for_exchange(X).
+validate_binding(_X, _B) ->
+    ok.
 
-policy_changed(_X1, _X2) -> ok.
+create(_Serial, _X) ->
+    ok.
 
-add_binding(_Serial, _Exchange, Binding) ->
-    rabbit_db_topic_exchange:set(Binding).
+delete(_Serial, _X) ->
+    ok.
 
-remove_bindings(_Serial, _X, Bs) ->
-    rabbit_db_topic_exchange:delete(Bs).
+policy_changed(_X1, _X2) ->
+    ok.
+
+add_binding(_Serial, _Exchange, _Binding) ->
+    ok.
+
+remove_bindings(_Serial, _X, _Bs) ->
+    ok.
 
 assert_args_equivalence(X, Args) ->
     rabbit_exchange:assert_args_equivalence(X, Args).
-
-%%----------------------------------------------------------------------------