[ISSUE #1281]⚡️Optimize name server DefaultRequestProcessor#delete_to…

…pic_in_name_srv
mxsm · Nov 24, 2024 · d4072c5 · d4072c5
1 parent 4ed0d3c
commit d4072c5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/rocketmq-namesrv/src/processor/default_request_processor.rs b/rocketmq-namesrv/src/processor/default_request_processor.rs
@@ -349,10 +349,8 @@ impl DefaultRequestProcessor {
         let request_header = request
             .decode_command_custom_header::<DeleteTopicFromNamesrvRequestHeader>()
             .expect("decode DeleteTopicFromNamesrvRequestHeader failed");
-        self.route_info_manager.delete_topic(
-            request_header.topic.as_str(),
-            request_header.cluster_name.clone(),
-        );
+        self.route_info_manager
+            .delete_topic(request_header.topic, request_header.cluster_name);
         RemotingCommand::create_response_command()
     }
 

diff --git a/rocketmq-namesrv/src/route/route_info_manager.rs b/rocketmq-namesrv/src/route/route_info_manager.rs
@@ -736,29 +736,30 @@ impl RouteInfoManager {
 
     pub(crate) fn delete_topic(
         &mut self,
-        topic: impl Into<String>,
-        cluster_name: Option<impl Into<String>>,
+        topic: CheetahString,
+        cluster_name: Option<CheetahString>,
     ) {
-        let topic_inner = topic.into();
-        if cluster_name.is_some() {
-            let cluster_name_inner = cluster_name.map(|s| s.into()).unwrap();
-            let broker_names = self.cluster_addr_table.get(cluster_name_inner.as_str());
+        let lock = self.lock.write();
+        if cluster_name.as_ref().is_some_and(|inner| !inner.is_empty()) {
+            let cluster_name_inner = cluster_name.unwrap();
+            let broker_names = self.cluster_addr_table.get(&cluster_name_inner);
             if broker_names.is_none() || broker_names.unwrap().is_empty() {
                 return;
             }
-            if let Some(queue_data_map) = self.topic_queue_table.get_mut(topic_inner.as_str()) {
+            if let Some(queue_data_map) = self.topic_queue_table.mut_from_ref().get_mut(&topic) {
                 for broker_name in broker_names.unwrap() {
                     if let Some(remove_qd) = queue_data_map.remove(broker_name) {
                         info!(
                             "deleteTopic, remove one broker's topic {} {} {:?}",
-                            broker_name, &topic_inner, remove_qd
+                            broker_name, &topic, remove_qd
                         )
                     }
                 }
             }
         } else {
-            self.topic_queue_table.remove(topic_inner.as_str());
+            self.topic_queue_table.mut_from_ref().remove(&topic);
         }
+        drop(lock)
     }
 
     pub(crate) fn register_topic(&mut self, topic: CheetahString, queue_data_vec: Vec<QueueData>) {