[ISSUE #1267]⚡️Optimize Name server DefaultRequestProcessor#query_bro…

…ker_topic_config
mxsm · Nov 21, 2024 · df7d8e4 · df7d8e4
1 parent 7a1ebfc
commit df7d8e4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/rocketmq-namesrv/src/processor/default_request_processor.rs b/rocketmq-namesrv/src/processor/default_request_processor.rs
@@ -51,6 +51,7 @@ use rocketmq_remoting::protocol::header::namesrv::topic_operation_header::Regist
 use rocketmq_remoting::protocol::remoting_command::RemotingCommand;
 use rocketmq_remoting::protocol::route::topic_route_data::TopicRouteData;
 use rocketmq_remoting::protocol::DataVersion;
+use rocketmq_remoting::protocol::RemotingDeserializable;
 use rocketmq_remoting::protocol::RemotingSerializable;
 use rocketmq_remoting::runtime::connection_handler_context::ConnectionHandlerContext;
 use tracing::warn;
@@ -165,10 +166,8 @@ impl DefaultRequestProcessor {
         let request_header = request
             .decode_command_custom_header::<QueryDataVersionRequestHeader>()
             .expect("decode QueryDataVersionRequestHeader failed");
-        let data_version = SerdeJsonUtils::decode::<DataVersion>(
-            request.body().as_ref().map(|v| v.as_ref()).unwrap(),
-        )
-        .unwrap();
+        let data_version = DataVersion::decode(request.get_body().expect("body is empty"))
+            .expect("decode DataVersion failed");
         let changed = self.route_info_manager.is_broker_topic_config_changed(
             &request_header.cluster_name,
             &request_header.broker_addr,

diff --git a/rocketmq-namesrv/src/route/route_info_manager.rs b/rocketmq-namesrv/src/route/route_info_manager.rs
@@ -513,11 +513,10 @@ impl RouteInfoManager {
     ) -> bool {
         let option = self.query_broker_topic_config(cluster_name.clone(), broker_addr.clone());
         if let Some(pre) = option {
-            if pre != data_version {
-                return true;
-            }
+            pre != data_version
+        } else {
+            true
         }
-        false
     }
 
     pub(crate) fn query_broker_topic_config(