Make plugin compatible with 3.12

due to rabbitmq/rabbitmq-server#6821

(cherry picked from commit 72b970c)

Author: ansd

Makefile

@@ -1,11 +1,11 @@
 PROJECT = rabbitmq_lvc_exchange
 PROJECT_DESCRIPTION = RabbitMQ Last Value Cache exchange
 
-RABBITMQ_VERSION ?= v3.11.x
+RABBITMQ_VERSION ?= v3.12.x
 current_rmq_ref = $(RABBITMQ_VERSION)
 
 define PROJECT_APP_EXTRA_KEYS
-	{broker_version_requirements, ["3.11.0"]}
+	{broker_version_requirements, ["3.12.0"]}
 endef
 
 dep_amqp_client                = git_rmq-subfolder rabbitmq-erlang-client $(RABBITMQ_VERSION)

README.md

@@ -16,12 +16,11 @@ binding key.
 
 ## Supported RabbitMQ Versions
 
-The most recent release of this plugin targets RabbitMQ 3.11.x.
-Release series earlier than 3.9 are [out of support](https://www.rabbitmq.com/versions.html).
+The most recent release of this plugin targets RabbitMQ 3.12.x.
 
 ## Supported Erlang/OTP Versions
 
-Latest version of this plugin [requires Erlang 25.0 or later versions](https://www.rabbitmq.com/which-erlang.html), same as RabbitMQ 3.11.x.
+Latest version of this plugin [requires Erlang 25.0 or later versions](https://www.rabbitmq.com/which-erlang.html), same as RabbitMQ 3.12.x.
 
 ## Installation
 

src/rabbit_exchange_type_lvc.erl

@@ -12,7 +12,7 @@
 
 -export([description/0, serialise_events/0, route/2]).
 -export([validate/1, validate_binding/2,
-         create/2, recover/2, delete/3, policy_changed/2,
+         create/2, recover/2, delete/2, policy_changed/2,
          add_binding/3, remove_bindings/3, assert_args_equivalence/2]).
 -export([info/1, info/2]).
 
@@ -32,7 +32,7 @@ route(#exchange{name = Name},
                CC when is_list(CC) -> CC;
                To                 -> [To]
            end,
-    rabbit_misc:execute_mnesia_transaction(
+    rabbit_mnesia:execute_mnesia_transaction(
       fun () ->
               [mnesia:write(?LVC_TABLE,
                             #cached{key = #cachekey{exchange=Name,
@@ -45,18 +45,21 @@ route(#exchange{name = Name},
 
 validate(_X) -> ok.
 validate_binding(_X, _B) -> ok.
-create(_Tx, _X) -> ok.
+create(_Serial, _X) -> ok.
 recover(_X, _Bs) -> ok.
 
-delete(transaction, #exchange{ name = Name }, _Bs) ->
-    [mnesia:delete(?LVC_TABLE, K, write) ||
-        #cached{ key = K } <-
-            mnesia:match_object(?LVC_TABLE,
-                                #cached{key = #cachekey{
-                                          exchange = Name, _ = '_' },
-                                        _ = '_'}, write)],
+delete(none, #exchange{ name = Name }) ->
+    rabbit_mnesia:execute_mnesia_transaction(
+      fun() ->
+              [mnesia:delete(?LVC_TABLE, K, write) ||
+               #cached{ key = K } <-
+               mnesia:match_object(?LVC_TABLE,
+                                   #cached{key = #cachekey{
+                                                    exchange = Name, _ = '_' },
+                                           _ = '_'}, write)]
+      end),
     ok;
-delete(_Tx, _X, _Bs) ->
+delete(_Serial, _X) ->
 	ok.
 
 policy_changed(_X1, _X2) -> ok.
@@ -85,7 +88,7 @@ add_binding(none, #exchange{ name = XName },
                     [#cached{content = Msg}] ->
                         Delivery = rabbit_basic:delivery(
                           false, false, Msg, undefined),
-                        Qs = rabbit_amqqueue:lookup(
+                        Qs = rabbit_amqqueue:lookup_many(
                           rabbit_exchange:route(E, Delivery)),
                         rabbit_amqqueue:deliver(Qs, Delivery)
                 end
@@ -105,10 +108,10 @@ add_binding(none, #exchange{ name = XName },
             end
     end,
     ok;
-add_binding(_Tx, _X, _B) ->
+add_binding(_Serial, _X, _B) ->
     ok.
 
-remove_bindings(_Tx, _X, _Bs) -> ok.
+remove_bindings(_Serial, _X, _Bs) -> ok.
 
 assert_args_equivalence(X, Args) ->
     rabbit_exchange_type_direct:assert_args_equivalence(X, Args).

test/lvc_SUITE.erl

@@ -72,6 +72,7 @@ lvc(Config) ->
     bind(Ch, X, RK, Q2),
     expect(Ch, Q1, Payload),
     expect(Ch, Q2, Payload),
+    exchange_delete(Ch, X),
     rabbit_ct_client_helpers:close_channel(Ch).
 
 lvc_bind_fanout_exchange(Config) ->
@@ -90,6 +91,7 @@ lvc_bind_fanout_exchange(Config) ->
     exchange_bind(Ch, X, RK, LvcX),
     expect(Ch, Q1, Payload),
     expect(Ch, Q2, Payload),
+    exchange_delete(Ch, X),
     rabbit_ct_client_helpers:close_channel(Ch).
 
 lvc_bind_direct_exchange(Config) ->
@@ -108,6 +110,7 @@ lvc_bind_direct_exchange(Config) ->
     exchange_bind(Ch, X, RK, LvcX),
     expect(Ch, Q1, Payload),
     expect(Ch, Q2, Payload),
+    exchange_delete(Ch, X),
     rabbit_ct_client_helpers:close_channel(Ch).
 
 
@@ -117,14 +120,16 @@ lvc_bind_direct_exchange(Config) ->
 
 exchange_declare(Ch, X) ->
     amqp_channel:call(Ch, #'exchange.declare'{exchange    = X,
-                                              type        = <<"x-lvc">>,
-                                              auto_delete = true}).
+                                              type        = <<"x-lvc">>}).
 
 exchange_declare(Ch, X, Type) ->
     amqp_channel:call(Ch, #'exchange.declare'{exchange    = X,
                                               type        = Type,
                                               auto_delete = true}).
 
+exchange_delete(Ch, X) ->
+    #'exchange.delete_ok'{} = amqp_channel:call(Ch, #'exchange.delete'{exchange = X}).
+
 queue_declare(Ch) ->
     #'queue.declare_ok'{queue = Q} =
         amqp_channel:call(Ch, #'queue.declare'{exclusive = true}),