Skip to content

Commit 7bc42c9

Browse files
mxsmmxsm
authored
[ISSUE #1196]🔥Optimize CheetahString as method arg🎨 (#1197)
1 parent 625b5c4 commit 7bc42c9

12 files changed

Lines changed: 116 additions & 141 deletions

File tree

‎rocketmq-broker/src/out_api/broker_outer_api.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ impl BrokerOuterAPI {
105105
let request_header =
106106
RegisterTopicRequestHeader::new(topic_config.topic_name.as_ref().cloned().unwrap());
107107
let queue_data = QueueData::new(
108-
broker_name.clone(),
108+
broker_name,
109109
topic_config.read_queue_nums,
110110
topic_config.write_queue_nums,
111111
topic_config.perm,
@@ -196,7 +196,7 @@ impl BrokerOuterAPI {
196196
if let Some(outer_api) = outer_api.upgrade() {
197197
outer_api
198198
.register_broker(
199-
addr,
199+
&addr,
200200
oneway,
201201
timeout_mills,
202202
cloned_header,
@@ -233,7 +233,7 @@ impl BrokerOuterAPI {
233233

234234
async fn register_broker(
235235
&self,
236-
namesrv_addr: CheetahString,
236+
namesrv_addr: &CheetahString,
237237
oneway: bool,
238238
timeout_mills: u64,
239239
request_header: RegisterBrokerRequestHeader,
@@ -258,7 +258,7 @@ impl BrokerOuterAPI {
258258
}
259259
match self
260260
.remoting_client
261-
.invoke_async(Some(namesrv_addr.clone()), request, timeout_mills)
261+
.invoke_async(Some(namesrv_addr), request, timeout_mills)
262262
.await
263263
{
264264
Ok(response) => match From::from(response.code()) {
@@ -318,7 +318,7 @@ impl BrokerOuterAPI {
318318
let client = self.remoting_client.clone();
319319
let join_handle = tokio::spawn(async move {
320320
client
321-
.invoke_async(Some(addr), cloned_request, timeout_mills)
321+
.invoke_async(Some(&addr), cloned_request, timeout_mills)
322322
.await
323323
});
324324
handle_vec.push(join_handle);
@@ -338,7 +338,7 @@ impl BrokerOuterAPI {
338338

339339
pub async fn lock_batch_mq_async(
340340
&self,
341-
addr: CheetahString,
341+
addr: &CheetahString,
342342
request_body: bytes::Bytes,
343343
timeout_millis: u64,
344344
) -> Result<HashSet<MessageQueue>> {
@@ -375,7 +375,7 @@ impl BrokerOuterAPI {
375375

376376
pub async fn unlock_batch_mq_async(
377377
&self,
378-
addr: CheetahString,
378+
addr: &CheetahString,
379379
request_body: bytes::Bytes,
380380
timeout_millis: u64,
381381
) -> Result<()> {

‎rocketmq-broker/src/processor/admin_broker_processor/batch_mq_handler.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ impl BatchMqHandler {
8686
let request_body_cloned = request_body.clone();
8787
tokio::spawn(async move {
8888
let result = broker_outer_api
89-
.lock_batch_mq_async(broker_addr, request_body_cloned, 1000)
89+
.lock_batch_mq_async(&broker_addr, request_body_cloned, 1000)
9090
.await;
9191
match result {
9292
Ok(lock_ok_mqs) => {
@@ -139,7 +139,7 @@ impl BatchMqHandler {
139139
match self
140140
.inner
141141
.broker_out_api
142-
.unlock_batch_mq_async(broker_addr.clone(), request_body.clone(), 1000)
142+
.unlock_batch_mq_async(broker_addr, request_body.clone(), 1000)
143143
.await
144144
{
145145
Ok(_) => {}

‎rocketmq-client/src/consumer/consumer_impl/re_balance/rebalance_impl.rs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -652,12 +652,7 @@ where
652652
.mq_client_api_impl
653653
.as_mut()
654654
.unwrap()
655-
.unlock_batch_mq(
656-
find_broker_result.broker_addr.as_str(),
657-
request_body,
658-
1_000,
659-
oneway,
660-
)
655+
.unlock_batch_mq(&find_broker_result.broker_addr, request_body, 1_000, oneway)
661656
.await;
662657
match result {
663658
Ok(_) => {

‎rocketmq-client/src/consumer/consumer_impl/re_balance/rebalance_push_impl.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ impl Rebalance for RebalancePushImpl {
471471
.as_mut()
472472
.unwrap()
473473
.unlock_batch_mq(
474-
find_broker_result.broker_addr.as_str(),
474+
find_broker_result.broker_addr.as_ref(),
475475
request_body,
476476
UNLOCK_BATCH_MQ_TIMEOUT_MS,
477477
oneway,

‎rocketmq-client/src/consumer/store/remote_broker_offset_store.rs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -314,11 +314,7 @@ impl OffsetStoreTrait for RemoteBrokerOffsetStore {
314314
.mq_client_api_impl
315315
.as_mut()
316316
.unwrap()
317-
.update_consumer_offset(
318-
find_broker_result.broker_addr.as_str(),
319-
request_header,
320-
5_000,
321-
)
317+
.update_consumer_offset(&find_broker_result.broker_addr, request_header, 5_000)
322318
.await?;
323319
};
324320
Ok(())

‎rocketmq-client/src/factory/mq_client_instance.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,17 +1096,17 @@ impl MQClientInstance {
10961096
producer_table.get(group).cloned()
10971097
}
10981098

1099-
pub async fn unregister_consumer(&mut self, group: impl Into<String>) {
1099+
pub async fn unregister_consumer(&mut self, group: impl Into<CheetahString>) {
11001100
self.unregister_client(None, Some(group.into())).await;
11011101
}
1102-
pub async fn unregister_producer(&mut self, group: impl Into<String>) {
1102+
pub async fn unregister_producer(&mut self, group: impl Into<CheetahString>) {
11031103
self.unregister_client(Some(group.into()), None).await;
11041104
}
11051105

11061106
async fn unregister_client(
11071107
&mut self,
1108-
producer_group: Option<String>,
1109-
consumer_group: Option<String>,
1108+
producer_group: Option<CheetahString>,
1109+
consumer_group: Option<CheetahString>,
11101110
) {
11111111
let broker_addr_table = self.broker_addr_table.read().await;
11121112
for (broker_name, broker_addrs) in broker_addr_table.iter() {
@@ -1117,7 +1117,7 @@ impl MQClientInstance {
11171117
.unwrap()
11181118
.unregister_client(
11191119
addr,
1120-
self.client_id.as_str(),
1120+
self.client_id.clone(),
11211121
producer_group.clone(),
11221122
consumer_group.clone(),
11231123
self.client_config.mq_client_api_timeout,

0 commit comments

Comments
 (0)