🐛 Fixes some bugs for UpdateAndCreateTopic, GetTopicConfig and GetConsumerConnectionList

rocketmq-broker/src/broker_runtime.rs

@@ -1343,10 +1343,7 @@ impl<MS: MessageStore> BrokerRuntimeInner<MS> {
         }
         self.broker_outer_api
             .register_single_topic_all(
-                self.broker_config
-                    .broker_identity
-                    .broker_cluster_name
-                    .clone(),
+                self.broker_config.broker_identity.broker_name.clone(),
                 topic_config,
                 3000,
             )

rocketmq-broker/src/processor/admin_broker_processor/consumer_request_handler.rs

@@ -85,7 +85,7 @@ impl<MS: MessageStore> ConsumerRequestHandler<MS> {
                     connection.set_version(channel_info.version());
                     connection
                         .set_client_addr(channel_info.key().remote_address().to_string().into());
-                    body_data.get_connection_set().insert(connection);
+                    body_data.connection_set_insert(connection);
                 }
                 let body = body_data
                     .encode()

rocketmq-broker/src/topic/manager/topic_config_manager.rs

@@ -490,8 +490,8 @@ impl<MS: MessageStore> TopicConfigManager<MS> {
         let final_attributes_result = AttributeUtil::alter_current_attributes(
             create,
             TopicAttributes::all(),
-            &new_attributes,
             &current_attributes,
+            &new_attributes,
         );
         match final_attributes_result {
             Ok(final_attributes) => {

rocketmq-remoting/src/protocol/body/consumer_connection.rs

@@ -72,6 +72,10 @@ impl ConsumerConnection {
         self.connection_set.clone()
     }
 
+    pub fn connection_set_insert(&mut self, connection: Connection) {
+        self.connection_set.insert(connection);
+    }
+
     pub fn set_connection_set(&mut self, connection_set: HashSet<Connection>) {
         self.connection_set = connection_set;
     }

rocketmq-remoting/src/protocol/static_topic/topic_config_and_queue_mapping.rs

@@ -22,8 +22,10 @@ use crate::protocol::static_topic::topic_queue_mapping_detail::TopicQueueMapping
 
 #[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq)]
 pub struct TopicConfigAndQueueMapping {
+    #[serde(flatten)]
     pub topic_config: TopicConfig,
 
+    #[serde(rename = "mappingDetail")]
     pub topic_queue_mapping_detail: Option<TopicQueueMappingDetail>,
 }