diff --git a/rocketmq-broker/src/long_polling/long_polling_service/pull_request_hold_service.rs b/rocketmq-broker/src/long_polling/long_polling_service/pull_request_hold_service.rs index 1f2fff9fc..c0e6cd56f 100644 --- a/rocketmq-broker/src/long_polling/long_polling_service/pull_request_hold_service.rs +++ b/rocketmq-broker/src/long_polling/long_polling_service/pull_request_hold_service.rs @@ -110,10 +110,6 @@ where } let topic = CheetahString::from(key_parts[0]); let queue_id = key_parts[1].parse::().unwrap(); - /*info!( - "check hold request, topic: {}, queue_id: {}", - topic, queue_id - );*/ let max_offset = self .broker_runtime_inner .message_store() diff --git a/rocketmq-common/src/common/message.rs b/rocketmq-common/src/common/message.rs index 814138419..1a75f4d10 100644 --- a/rocketmq-common/src/common/message.rs +++ b/rocketmq-common/src/common/message.rs @@ -326,7 +326,7 @@ pub trait MessageTrait: Any + Display + Debug { /// # Returns /// /// An `Option` containing the buyer ID if it exists, otherwise `None`. - fn get_buyer_id(&self) -> Option { + fn buyer_id(&self) -> Option { self.property(&CheetahString::from_static_str(MessageConst::PROPERTY_BUYER_ID)) } diff --git a/rocketmq-store/src/stats/broker_stats_manager.rs b/rocketmq-store/src/stats/broker_stats_manager.rs index 4df676a8a..33e054d4e 100644 --- a/rocketmq-store/src/stats/broker_stats_manager.rs +++ b/rocketmq-store/src/stats/broker_stats_manager.rs @@ -13,8 +13,6 @@ // limitations under the License. use std::sync::Arc; -use std::time::SystemTime; -use std::time::UNIX_EPOCH; use cheetah_string::CheetahString; use dashmap::DashMap; @@ -33,11 +31,11 @@ use rocketmq_common::common::stats::stats_item::StatsItem; use rocketmq_common::common::stats::stats_item_set::StatsItemSet; use rocketmq_common::common::stats::Stats; use rocketmq_common::common::topic::TopicValidator; +use rocketmq_common::TimeUtils::current_millis; use rocketmq_rust::schedule::simple_scheduler::ScheduledTaskManager; use tokio::time::Duration; use tracing::info; use tracing::warn; - type TaskId = u64; pub struct BrokerStatsManager { @@ -167,7 +165,7 @@ impl BrokerStatsManager { /// Compute delay to next minute boundary fn compute_initial_delay_to_next_minute() -> Duration { - let now = SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_millis() as u64; + let now = current_millis(); let next_minute = ((now / 60000) + 1) * 60000; let delay_ms = next_minute - now;