fix ci

Author: mxsm

rocketmq-broker/src/broker_controller.rs

@@ -14,22 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-use std::net::SocketAddr;
-use std::sync::Arc;
+use std::{net::SocketAddr, sync::Arc};
 
-use tracing::{info, warn};
-
-use rocketmq_common::common::config_manager::ConfigManager;
-use rocketmq_common::TokioExecutorService;
-use rocketmq_remoting::code::request_code::RequestCode;
-use rocketmq_remoting::server::rocketmq_server::RocketmqDefaultServer;
-use rocketmq_remoting::server::RemotingServer;
+use rocketmq_common::{common::config_manager::ConfigManager, TokioExecutorService};
+use rocketmq_remoting::{
+    code::request_code::RequestCode,
+    server::{rocketmq_server::RocketmqDefaultServer, RemotingServer},
+};
 use rocketmq_store::{
     base::store_enum::StoreType, config::message_store_config::MessageStoreConfig,
     log_file::MessageStore, message_store::local_file_store::LocalFileMessageStore,
     status::manager::broker_stats_manager::BrokerStatsManager,
     timer::timer_message_store::TimerMessageStore,
 };
+use tracing::{info, warn};
 
 use crate::{
     broker_config::BrokerConfig,

rocketmq-broker/src/processor/ack_message_processor.rs

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-use rocketmq_remoting::runtime::server::ConnectionHandlerContext;
 use rocketmq_remoting::{
-    protocol::remoting_command::RemotingCommand, runtime::processor::RequestProcessor,
+    protocol::remoting_command::RemotingCommand,
+    runtime::{processor::RequestProcessor, server::ConnectionHandlerContext},
 };
 
 #[derive(Default)]

rocketmq-broker/src/processor/change_invisible_time_processor.rs

@@ -14,8 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-use rocketmq_remoting::runtime::processor::RequestProcessor;
-use rocketmq_remoting::runtime::server::ConnectionHandlerContext;
+use rocketmq_remoting::runtime::{processor::RequestProcessor, server::ConnectionHandlerContext};
 
 #[derive(Default)]
 pub struct ChangeInvisibleTimeProcessor {}

rocketmq-broker/src/processor/notification_processor.rs

@@ -14,8 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-use rocketmq_remoting::runtime::processor::RequestProcessor;
-use rocketmq_remoting::runtime::server::ConnectionHandlerContext;
+use rocketmq_remoting::runtime::{processor::RequestProcessor, server::ConnectionHandlerContext};
 
 #[derive(Default)]
 pub struct NotificationProcessor {}

rocketmq-broker/src/processor/peek_message_processor.rs

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-use rocketmq_remoting::runtime::server::ConnectionHandlerContext;
 use rocketmq_remoting::{
-    protocol::remoting_command::RemotingCommand, runtime::processor::RequestProcessor,
+    protocol::remoting_command::RemotingCommand,
+    runtime::{processor::RequestProcessor, server::ConnectionHandlerContext},
 };
 
 #[derive(Default)]

rocketmq-broker/src/processor/polling_info_processor.rs

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-use rocketmq_remoting::runtime::server::ConnectionHandlerContext;
 use rocketmq_remoting::{
-    protocol::remoting_command::RemotingCommand, runtime::processor::RequestProcessor,
+    protocol::remoting_command::RemotingCommand,
+    runtime::{processor::RequestProcessor, server::ConnectionHandlerContext},
 };
 
 #[derive(Default)]

rocketmq-broker/src/processor/pop_message_processor.rs

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-use rocketmq_remoting::runtime::server::ConnectionHandlerContext;
 use rocketmq_remoting::{
-    protocol::remoting_command::RemotingCommand, runtime::processor::RequestProcessor,
+    protocol::remoting_command::RemotingCommand,
+    runtime::{processor::RequestProcessor, server::ConnectionHandlerContext},
 };
 
 #[derive(Default)]

rocketmq-broker/src/processor/pull_message_processor.rs

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-use rocketmq_remoting::runtime::server::ConnectionHandlerContext;
 use rocketmq_remoting::{
-    protocol::remoting_command::RemotingCommand, runtime::processor::RequestProcessor,
+    protocol::remoting_command::RemotingCommand,
+    runtime::{processor::RequestProcessor, server::ConnectionHandlerContext},
 };
 
 #[derive(Default)]

rocketmq-broker/src/processor/reply_message_processor.rs

@@ -14,8 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-use rocketmq_remoting::runtime::processor::RequestProcessor;
-use rocketmq_remoting::runtime::server::ConnectionHandlerContext;
+use rocketmq_remoting::runtime::{processor::RequestProcessor, server::ConnectionHandlerContext};
 
 #[derive(Default)]
 pub struct ReplyMessageProcessor {}

rocketmq-broker/src/processor/send_message_processor.rs

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-use rocketmq_remoting::runtime::server::ConnectionHandlerContext;
 use rocketmq_remoting::{
-    protocol::remoting_command::RemotingCommand, runtime::processor::RequestProcessor,
+    protocol::remoting_command::RemotingCommand,
+    runtime::{processor::RequestProcessor, server::ConnectionHandlerContext},
 };
 
 #[derive(Default)]

rocketmq-common/src/common.rs

@@ -17,22 +17,23 @@
 
 use std::fmt;
 
+pub use faq::FAQUrl;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
+pub use crate::common::sys_flag::topic_sys_flag as TopicSysFlag;
+
+pub mod attribute;
+pub mod boundary_type;
+pub mod broker;
 pub mod config;
+pub mod config_manager;
 pub mod constant;
 mod faq;
-pub use faq::FAQUrl;
+pub mod message;
 pub mod mix_all;
 pub mod mq_version;
 pub mod namesrv;
 mod sys_flag;
-pub use crate::common::sys_flag::topic_sys_flag as TopicSysFlag;
-pub mod attribute;
-pub mod boundary_type;
-pub mod broker;
-pub mod config_manager;
-pub mod message;
 pub mod topic;
 
 #[derive(Debug, Clone)]

rocketmq-common/src/common/broker/broker_config.rs

@@ -17,7 +17,7 @@
 
 use serde::Deserialize;
 
-use crate::common::{mix_all, topic::TopicValidator};
+use crate::common::mix_all;
 
 #[derive(Debug, Default, Deserialize)]
 #[serde(rename_all = "camelCase")]

rocketmq-common/src/common/message.rs

@@ -15,13 +15,18 @@
  * limitations under the License.
  */
 
+use std::{
+    collections::{HashMap, HashSet},
+    string::ToString,
+};
+
+use lazy_static::lazy_static;
+
 pub mod message_batch;
 pub mod message_id;
 pub mod message_queue;
 pub mod message_single;
 
-use std::collections::HashMap;
-
 pub trait MessageTrait {
     fn get_topic(&self) -> &str;
 
@@ -99,10 +104,6 @@ impl MessageVersion {
     }
 }
 
-use std::{collections::HashSet, string::ToString};
-
-use lazy_static::lazy_static;
-
 pub struct MessageConst;
 
 impl MessageConst {

rocketmq-common/src/lib.rs

@@ -18,18 +18,21 @@
 #![allow(dead_code)]
 #![allow(unused_imports)]
 
-pub use crate::thread_pool::{
-    FuturesExecutorService, FuturesExecutorServiceBuilder, ScheduledExecutorService,
-    TokioExecutorService,
+pub use crate::{
+    thread_pool::{
+        FuturesExecutorService, FuturesExecutorServiceBuilder, ScheduledExecutorService,
+        TokioExecutorService,
+    },
+    utils::{
+        crc32_utils as CRC32Utils, env_utils as EnvUtils, file_utils as FileUtils,
+        parse_config_file as ParseConfigFile, time_utils as TimeUtils,
+    },
 };
 
 pub mod common;
 pub mod log;
 mod thread_pool;
 pub mod utils;
-pub use crate::utils::{
-    crc32_utils as CRC32Utils, env_utils as EnvUtils, file_utils as FileUtils,
-    parse_config_file as ParseConfigFile, time_utils as TimeUtils,
-};
+
 #[cfg(test)]
 mod tests {}

rocketmq-namesrv/src/bin/bootstrap_server.rs

@@ -18,13 +18,10 @@
 use std::{collections::HashMap, net::SocketAddr, path::PathBuf, sync::Arc, time::Duration};
 
 use clap::Parser;
-use tokio::{net::TcpListener, sync::broadcast, task::JoinHandle};
-use tracing::info;
-
-use rocketmq_common::common::Pair;
 use rocketmq_common::{
-    common::namesrv::namesrv_config::NamesrvConfig, EnvUtils::EnvUtils, ParseConfigFile,
-    ScheduledExecutorService, TokioExecutorService,
+    common::{namesrv::namesrv_config::NamesrvConfig, Pair},
+    EnvUtils::EnvUtils,
+    ParseConfigFile, ScheduledExecutorService, TokioExecutorService,
 };
 use rocketmq_namesrv::{
     processor::{default_request_processor::DefaultRequestProcessor, ClientRequestProcessor},
@@ -35,6 +32,8 @@ use rocketmq_remoting::{
     runtime::{processor::RequestProcessor, server},
 };
 use rocketmq_rust::rocketmq;
+use tokio::{net::TcpListener, sync::broadcast, task::JoinHandle};
+use tracing::info;
 
 #[rocketmq::main]
 async fn main() -> anyhow::Result<()> {

rocketmq-namesrv/src/kvconfig.rs

@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-pub mod kvconfig_mananger;
-
 use std::collections::HashMap;
 
 use rocketmq_remoting::protocol::RemotingSerializable;
 use serde::{Deserialize, Serialize};
 
+pub mod kvconfig_mananger;
+
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct KVConfigSerializeWrapper {
     #[serde(rename = "configTable")]

rocketmq-namesrv/src/lib.rs

@@ -17,11 +17,14 @@
 
 #![allow(dead_code)]
 
+pub use self::{
+    kvconfig::kvconfig_mananger::KVConfigManager,
+    namesrv_config_parse::parse_command_and_config_file,
+    route::route_info_manager::RouteInfoManager,
+};
+
+mod kvconfig;
 mod namesrv_config_parse;
-pub use self::namesrv_config_parse::parse_command_and_config_file;
 pub mod processor;
 mod route;
-pub use self::route::route_info_manager::RouteInfoManager;
-mod kvconfig;
-pub use self::kvconfig::kvconfig_mananger::KVConfigManager;
 mod route_info;

rocketmq-namesrv/src/processor.rs

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
-mod client_request_processor;
 pub use self::client_request_processor::ClientRequestProcessor;
+
+mod client_request_processor;
 pub mod default_request_processor;

rocketmq-namesrv/src/processor/client_request_processor.rs

@@ -24,21 +24,19 @@ use std::{
 };
 
 use bytes::Bytes;
-use tracing::warn;
-
 use rocketmq_common::{
     common::{namesrv::namesrv_config::NamesrvConfig, FAQUrl},
     TimeUtils,
 };
-use rocketmq_remoting::runtime::server::ConnectionHandlerContext;
 use rocketmq_remoting::{
     code::response_code::{RemotingSysResponseCode, ResponseCode},
     protocol::{
         header::client_request_header::GetRouteInfoRequestHeader,
         remoting_command::RemotingCommand, RemotingSerializable,
     },
-    runtime::processor::RequestProcessor,
+    runtime::{processor::RequestProcessor, server::ConnectionHandlerContext},
 };
+use tracing::warn;
 
 use crate::{
     kvconfig::kvconfig_mananger::KVConfigManager, route::route_info_manager::RouteInfoManager,

rocketmq-namesrv/src/processor/default_request_processor.rs

@@ -22,7 +22,6 @@ use rocketmq_common::{
     common::{mix_all, mq_version::RocketMqVersion, namesrv::namesrv_config::NamesrvConfig},
     CRC32Utils,
 };
-use rocketmq_remoting::runtime::server::ConnectionHandlerContext;
 use rocketmq_remoting::{
     code::{
         request_code::RequestCode,
@@ -62,7 +61,7 @@ use rocketmq_remoting::{
         route::route_data_view::TopicRouteData,
         DataVersion, RemotingSerializable,
     },
-    runtime::processor::RequestProcessor,
+    runtime::{processor::RequestProcessor, server::ConnectionHandlerContext},
 };
 use tracing::{info, warn};
 

rocketmq-remoting/src/clients.rs

@@ -26,8 +26,8 @@ pub use blocking_client::BlockingClient;
 pub use client::Client;
 use rocketmq_common::TokioExecutorService;
 
-use crate::net::ResponseFuture;
 use crate::{
+    net::ResponseFuture,
     protocol::remoting_command::RemotingCommand,
     remoting::{InvokeCallback, RemotingService},
     runtime::processor::RequestProcessor,

rocketmq-remoting/src/remoting.rs

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-use crate::net::ResponseFuture;
-use crate::{protocol::remoting_command::RemotingCommand, runtime::RPCHook};
+use crate::{net::ResponseFuture, protocol::remoting_command::RemotingCommand, runtime::RPCHook};
 
 pub trait RemotingService: Send {
     fn start(&mut self) -> impl std::future::Future<Output = ()> + Send;