Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
9 changes: 5 additions & 4 deletions rocketmq-client/src/base/client_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
17 changes: 9 additions & 8 deletions rocketmq-common/src/common/message/message_queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
}
Expand All @@ -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 {
Expand All @@ -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;
}

Expand All @@ -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;
}

Expand Down
Loading