Fix rebase issues

rabbitmq · Jan 31, 2023 · 3337f69 · 3337f69
1 parent eba2456
commit 3337f69
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/deps/rabbit/src/rabbit_amqqueue.erl b/deps/rabbit/src/rabbit_amqqueue.erl
@@ -1259,9 +1259,10 @@ list_down(VHostPath) ->
                       Pid = amqqueue:get_pid(Q),
                       St = amqqueue:get_state(Q),
                       amqqueue:get_vhost(Q) =:= VHostPath
-                          andalso (St =:= stopped andalso not lists:member(node(Pid), NodesRunning))
-                          orelse
-                            (not sets:is_element(N, Alive))
+                          andalso
+                            ((St =:= stopped andalso not lists:member(node(Pid), NodesRunning))
+                             orelse
+                               (not sets:is_element(N, Alive)))
               end)
     end.
 

diff --git a/deps/rabbit/src/rabbit_core_ff.erl b/deps/rabbit/src/rabbit_core_ff.erl
@@ -143,7 +143,7 @@ direct_exchange_routing_v2_enable(#{feature_name := FeatureName}) ->
                 ?LOG_ERROR(
                   "Feature flags: `~ts`: failed to add copy of table ~ts to "
                   "node ~tp: ~tp",
-                  [FeatureName, NewTable, node(), Err],
+                   [FeatureName, TableName, node(), Err],
                   #{domain => ?RMQLOG_DOMAIN_FEAT_FLAGS}),
                 Error
         end

diff --git a/deps/rabbit/src/rabbit_db_binding.erl b/deps/rabbit/src/rabbit_db_binding.erl
@@ -483,7 +483,6 @@ create_index_route_table() ->
        }).
 
 create_index_route_table_in_mnesia() ->
-    TableName = rabbit_index_route,
     DependantTables = [?MNESIA_TABLE, rabbit_exchange],
     ok = rabbit_table:wait(DependantTables, _Retry = true),
     [ok = rabbit_table:create_local_copy(Tab, ram_copies) || Tab <- DependantTables],

diff --git a/deps/rabbitmq_mqtt/src/rabbit_mqtt_processor.erl b/deps/rabbitmq_mqtt/src/rabbit_mqtt_processor.erl
@@ -1253,7 +1253,7 @@ deliver_to_queues(Delivery,
                   RoutedToQNames,
                   State0 = #state{queue_states = QStates0,
                                   cfg = #cfg{proto_ver = ProtoVer}}) ->
-    Qs0 = rabbit_amqqueue:lookup(RoutedToQNames),
+    Qs0 = rabbit_amqqueue:lookup_many(RoutedToQNames),
     Qs = rabbit_amqqueue:prepend_extra_bcc(Qs0),
     case rabbit_queue_type:deliver(Qs, Delivery, QStates0) of
         {ok, QStates, Actions} ->