[ISSUE #1150]Use CheetahString to replace std String in MessageQueue (#1151)

Author: Fly-cmd-ops

Cargo.lock

@@ -157,8 +157,8 @@ impl ConsumerRequestHandler {
 
             for i in 0..topic_config.unwrap().get_read_queue_nums() {
                 let mut mq = MessageQueue::new();
-                mq.set_topic(topic.clone());
-                mq.set_broker_name(self.inner.broker_config.broker_name.clone());
+                mq.set_topic(topic.to_string().into());
+                mq.set_broker_name(self.inner.broker_config.broker_name.clone().into());
                 mq.set_queue_id(i as i32);
 
                 let mut offset_wrapper = OffsetWrapper::new();

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

@@ -448,8 +448,8 @@ impl TopicRequestHandler {
         let mut map = HashMap::new();
         for i in 0..max_queue_nums {
             let mut message_queue = MessageQueue::new();
-            message_queue.set_topic(topic.to_string());
-            message_queue.set_broker_name(self.inner.broker_config.broker_name.clone());
+            message_queue.set_topic(topic.into());
+            message_queue.set_broker_name(self.inner.broker_config.broker_name.clone().into());
             message_queue.set_queue_id(i as i32);
             let mut topic_offset = TopicOffset::new();
             let min = std::cmp::max(

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

@@ -253,8 +253,8 @@ impl PullMessageResultHandler for DefaultPullMessageResultHandler {
                         .read_custom_header_mut::<PullMessageResponseHeader>()
                         .unwrap();
                     let mut mq = MessageQueue::new();
-                    mq.set_topic(request_header.topic.to_string());
-                    mq.set_broker_name(self.broker_config.broker_name.clone());
+                    mq.set_topic(request_header.topic.clone());
+                    mq.set_broker_name(self.broker_config.broker_name.clone().into());
                     mq.set_queue_id(request_header.queue_id.unwrap());
 
                     let offset_moved_event = OffsetMovedEvent {

rocketmq-broker/src/processor/default_pull_message_result_handler.rs

@@ -20,6 +20,7 @@ use std::sync::atomic::Ordering;
 use std::sync::Arc;
 use std::time::Duration;
 
+use cheetah_string::CheetahString;
 use rocketmq_common::common::message::message_queue::MessageQueue;
 use rocketmq_common::utils::name_server_address_utils::NameServerAddressUtils;
 use rocketmq_common::utils::name_server_address_utils::NAMESRV_ENDPOINT_PATTERN;
@@ -142,15 +143,15 @@ impl ClientConfig {
         )
     }
 
-    pub fn queue_with_namespace(&mut self, queue: MessageQueue) -> MessageQueue {
+    pub fn queue_with_namespace(&mut self, mut queue: MessageQueue) -> MessageQueue {
         if let Some(namespace) = self.get_namespace() {
             if !namespace.is_empty() {
-                let mut message_queue = queue.clone();
-                message_queue.set_topic(NamespaceUtil::wrap_namespace(
+                let topic = CheetahString::from_string(NamespaceUtil::wrap_namespace(
                     namespace.as_str(),
                     queue.get_topic(),
                 ));
-                return message_queue;
+                queue.set_topic(topic);
+                return queue;
             }
         }
         queue

rocketmq-client/src/base/client_config.rs

@@ -20,22 +20,23 @@ use std::fmt;
 use std::hash::Hash;
 use std::hash::Hasher;
 
+use cheetah_string::CheetahString;
 use serde::Deserialize;
 use serde::Serialize;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct MessageQueue {
-    topic: String,
-    broker_name: String,
+    topic: CheetahString,
+    broker_name: CheetahString,
     queue_id: i32,
 }
 
 impl MessageQueue {
     pub fn new() -> Self {
         MessageQueue {
-            topic: String::new(),
-            broker_name: String::new(),
+            topic: CheetahString::new(),
+            broker_name: CheetahString::new(),
             queue_id: 0,
         }
     }
@@ -49,8 +50,8 @@ impl MessageQueue {
     }
 
     pub fn from_parts(
-        topic: impl Into<String>,
-        broker_name: impl Into<String>,
+        topic: impl Into<CheetahString>,
+        broker_name: impl Into<CheetahString>,
         queue_id: i32,
     ) -> Self {
         MessageQueue {
@@ -65,7 +66,7 @@ impl MessageQueue {
     }
 
     #[inline]
-    pub fn set_topic(&mut self, topic: String) {
+    pub fn set_topic(&mut self, topic: CheetahString) {
         self.topic = topic;
     }
 
@@ -74,7 +75,7 @@ impl MessageQueue {
         &self.broker_name
     }
 
-    pub fn set_broker_name(&mut self, broker_name: String) {
+    pub fn set_broker_name(&mut self, broker_name: CheetahString) {
         self.broker_name = broker_name;
     }