rabbit_db_*: Add dialyzer ignores for adv API changes

Author: the-mikedavis

deps/rabbit/src/rabbit_db_exchange.erl

@@ -56,6 +56,11 @@
          khepri_exchange_serial_path/1, khepri_exchange_serial_path/2
         ]).
 
+%% Ignored because of changes in the Khepri adv API. See comments within
+%% these functions.
+-dialyzer({nowarn_function, [update_in_khepri/2,
+                             next_serial_in_khepri/1]}).
+
 -define(MNESIA_TABLE, rabbit_exchange).
 -define(MNESIA_DURABLE_TABLE, rabbit_durable_exchange).
 -define(MNESIA_SERIAL_TABLE, rabbit_exchange_serial).

deps/rabbit/src/rabbit_db_msup.erl

@@ -27,6 +27,10 @@
 
 -export([khepri_mirrored_supervisor_path/2]).
 
+%% Ignored because of changes in the Khepri adv API. See comments within
+%% these functions.
+-dialyzer({nowarn_function, [create_or_update_in_khepri/5]}).
+
 -define(TABLE, mirrored_sup_childspec).
 -define(TABLE_DEF,
         {?TABLE,

deps/rabbit/src/rabbit_db_queue.erl

@@ -79,6 +79,13 @@
 -dialyzer({nowarn_function, [foreach_transient/1,
                              foreach_transient_in_khepri/1]}).
 
+%% Ignored because of changes in the Khepri adv API. See comments within
+%% these functions.
+-dialyzer({nowarn_function, [delete_in_khepri_tx/2,
+                             update_in_khepri/2,
+                             update_decorators_in_khepri/2,
+                             do_delete_transient_queues_in_khepri_tx/2]}).
+
 -define(MNESIA_TABLE, rabbit_queue).
 -define(MNESIA_DURABLE_TABLE, rabbit_durable_queue).
 
@@ -409,23 +416,26 @@ delete_in_khepri(QueueName) ->
 delete_in_khepri(QueueName, OnlyDurable) ->
     rabbit_khepri:transaction(
       fun () ->
-              Path = khepri_queue_path(QueueName),
-              case khepri_tx_adv:delete(Path) of
-                  %% Khepri 0.16 and below returned `khepri:node_props()' for
-                  %% adv queries and commands targeting one node:
-                  {ok, #{data := _}} ->
-                      %% we want to execute some things, as decided by rabbit_exchange,
-                      %% after the transaction.
-                      rabbit_db_binding:delete_for_destination_in_khepri(QueueName, OnlyDurable);
-                  %% Khepri 0.17+ returns `khepri_adv:node_props_map()`
-                  %% instead.
-                  {ok, #{Path := #{data := _}}} ->
-                      rabbit_db_binding:delete_for_destination_in_khepri(QueueName, OnlyDurable);
-                  {ok, _} ->
-                      ok
-              end
+              delete_in_khepri_tx(QueueName, OnlyDurable)
       end, rw).
 
+delete_in_khepri_tx(QueueName, OnlyDurable) ->
+    Path = khepri_queue_path(QueueName),
+    case khepri_tx_adv:delete(Path) of
+        %% Khepri 0.16 and below returned `khepri:node_props()' for
+        %% adv queries and commands targeting one node:
+        {ok, #{data := _}} ->
+            %% we want to execute some things, as decided by rabbit_exchange,
+            %% after the transaction.
+            rabbit_db_binding:delete_for_destination_in_khepri(QueueName, OnlyDurable);
+        %% Khepri 0.17+ returns `khepri_adv:node_props_map()`
+        %% instead.
+        {ok, #{Path := #{data := _}}} ->
+            rabbit_db_binding:delete_for_destination_in_khepri(QueueName, OnlyDurable);
+        {ok, _} ->
+            ok
+    end.
+
 %% -------------------------------------------------------------------
 %% internal_delete().
 %% -------------------------------------------------------------------

deps/rabbit/src/rabbit_db_rtparams.erl

@@ -22,6 +22,11 @@
          khepri_global_rp_path/1
         ]).
 
+%% Ignored because of changes in the Khepri adv API. See comments within
+%% these functions.
+-dialyzer({nowarn_function, [set_in_khepri/2,
+                             set_in_khepri_tx/2]}).
+
 -define(MNESIA_TABLE, rabbit_runtime_parameters).
 -define(KHEPRI_GLOBAL_PROJECTION, rabbit_khepri_global_rtparam).
 -define(KHEPRI_VHOST_PROJECTION, rabbit_khepri_per_vhost_rtparam).

deps/rabbit/src/rabbit_db_vhost.erl

@@ -53,6 +53,11 @@
         ]).
 -endif.
 
+%% Ignored because of changes in the Khepri adv API. See comments within
+%% these functions.
+-dialyzer({nowarn_function, [merge_metadata_in_khepri/2,
+                             update_in_khepri/2]}).
+
 -define(MNESIA_TABLE, rabbit_vhost).
 -define(KHEPRI_PROJECTION, rabbit_khepri_vhost).
 

deps/rabbitmq_consistent_hash_exchange/src/rabbit_db_ch_exchange.erl

@@ -24,6 +24,10 @@
          khepri_consistent_hash_path/2
         ]).
 
+%% Ignored because of changes in the Khepri adv API. See comments within
+%% these functions.
+-dialyzer({nowarn_function, [create_binding_in_khepri/4]}).
+
 -define(HASH_RING_STATE_TABLE, rabbit_exchange_type_consistent_hash_ring_state).
 
 -rabbit_mnesia_tables_to_khepri_db(

deps/rabbitmq_jms_topic_exchange/src/rabbit_db_jms_exchange.erl

@@ -24,6 +24,10 @@
          khepri_jms_topic_exchange_path/2
         ]).
 
+%% Ignored because of changes in the Khepri adv API. See comments within
+%% these functions.
+-dialyzer({nowarn_function, [update_in_khepri/4]}).
+
 -rabbit_mnesia_tables_to_khepri_db(
      [{?JMS_TOPIC_TABLE, rabbit_db_jms_exchange_m2k_converter}]).
 

deps/rabbitmq_recent_history_exchange/src/rabbit_db_rh_exchange.erl

@@ -22,6 +22,10 @@
 
 -export([khepri_recent_history_path/1]).
 
+%% Ignored because of changes in the Khepri adv API. See comments within
+%% these functions.
+-dialyzer({nowarn_function, [insert_in_khepri/3]}).
+
 -rabbit_mnesia_tables_to_khepri_db(
    [{?RH_TABLE, rabbit_db_rh_exchange_m2k_converter}]).