[ISSUE #2424]Bump rand from 0.8.5 to 0.9.0

Author: mxsm

Cargo.lock

@@ -56,7 +56,7 @@ serde_json = "1.0"
 serde_json_any_key = "2.0.0"
 anyhow = "1.0.95"
 bytes = "1.9.0"
-rand = "0.8"
+rand = "0.9.0"
 lazy_static = "1.5.0"
 num_cpus = "1.16"
 

Cargo.toml

@@ -40,7 +40,7 @@ bytes = { workspace = true }
 parking_lot.workspace = true
 
 clap = { version = "4.5.27", features = ["derive"] }
-rand = "0.8.5"
+rand = { workspace = true }
 
 #tools
 dirs.workspace = true

rocketmq-broker/Cargo.toml

@@ -27,7 +27,6 @@ use std::sync::Arc;
 use bytes::Bytes;
 use bytes::BytesMut;
 use cheetah_string::CheetahString;
-use rand::thread_rng;
 use rand::Rng;
 use rocketmq_common::common::config::TopicConfig;
 use rocketmq_common::common::constant::consume_init_mode::ConsumeInitMode;
@@ -489,7 +488,7 @@ where
             (subscription_data, None)
         };
 
-        let randomq = thread_rng().gen_range(0..100);
+        let randomq = rand::rng().random_range(0..100);
         let revive_qid = if request_header.order.unwrap_or(false) {
             POP_ORDER_REVIVE_QUEUE
         } else {

rocketmq-broker/src/processor/pop_message_processor.rs

@@ -1193,7 +1193,7 @@ where
         let mut new_topic =
             CheetahString::from_string(mix_all::get_retry_topic(request_header.group.as_str()));
         let mut queue_id_int =
-            rand::thread_rng().gen_range(0..subscription_group_config.retry_queue_nums());
+            rand::rng().random_range(0..subscription_group_config.retry_queue_nums());
         let topic_sys_flag = if request_header.unit_mode {
             TopicSysFlag::build_sys_flag(false, true)
         } else {
@@ -1593,7 +1593,7 @@ where
     }
 
     pub(crate) fn random_queue_id(&self, write_queue_nums: u32) -> u32 {
-        rand::thread_rng().gen_range(0..=99999999) % write_queue_nums
+        rand::rng().random_range(0..=99999999) % write_queue_nums
     }
 }
 

rocketmq-broker/src/processor/send_message_processor.rs

@@ -37,15 +37,15 @@ impl ThreadLocalIndex {
             let mut index = index.borrow_mut();
             let new_value = match *index {
                 Some(val) => val.wrapping_add(1) & POSITIVE_MASK,
-                None => rand::thread_rng().gen_range(0..=MAX) & POSITIVE_MASK,
+                None => rand::rng().random_range(0..=MAX) & POSITIVE_MASK,
             };
             *index = Some(new_value);
             new_value
         })
     }
 
     pub fn reset(&self) {
-        let new_value = rand::thread_rng().gen_range(0..=MAX).abs();
+        let new_value = rand::rng().random_range(0..=MAX).abs();
         THREAD_LOCAL_INDEX.with(|index| {
             *index.borrow_mut() = Some(new_value);
         });

rocketmq-client/src/common/thread_local_index.rs

@@ -456,8 +456,8 @@ impl PullAPIWrapper {
 }
 
 pub fn random_num() -> i32 {
-    let mut rng = rand::thread_rng();
-    let mut value = rng.gen::<i32>();
+    let mut rng = rand::rng();
+    let mut value = rng.random::<i32>();
     if value < 0 {
         value = value.abs();
         if value < 0 {

rocketmq-client/src/consumer/consumer_impl/pull_api_wrapper.rs

@@ -23,7 +23,7 @@ use std::thread;
 use std::time::Duration;
 
 use cheetah_string::CheetahString;
-use rand::seq::SliceRandom;
+use rand::seq::IndexedRandom;
 use rocketmq_common::common::base::service_state::ServiceState;
 use rocketmq_common::common::constant::PermName;
 use rocketmq_common::common::filter::expression_type::ExpressionType;
@@ -508,7 +508,7 @@ impl MQClientInstance {
         if let Some(topic_route_data) = topic_route_table.get(topic) {
             let brokers = &topic_route_data.broker_datas;
             if !brokers.is_empty() {
-                let bd = brokers.choose(&mut rand::thread_rng());
+                let bd = brokers.choose(&mut rand::rng());
                 if let Some(bd) = bd {
                     return bd.select_broker_addr();
                 }

rocketmq-client/src/factory/mq_client_instance.rs

@@ -101,7 +101,7 @@ where
 
         if !tmp_list.is_empty() {
             use rand::seq::SliceRandom;
-            let mut rng = rand::thread_rng();
+            let mut rng = rand::rng();
             tmp_list.shuffle(&mut rng);
             for fault_item in tmp_list {
                 if fault_item

rocketmq-client/src/latency/latency_fault_tolerance_impl.rs

@@ -424,6 +424,6 @@ impl<PR: RequestProcessor + Sync + Clone + 'static> RemotingClient for RocketmqD
 }
 
 fn init_value_index() -> i32 {
-    let mut rng = rand::thread_rng();
-    rng.gen_range(0..999)
+    let mut rng = rand::rng();
+    rng.random_range(0..999)
 }

rocketmq-remoting/src/clients/rocketmq_default_impl.rs

@@ -131,11 +131,7 @@ impl BrokerData {
     pub fn select_broker_addr(&self) -> Option<CheetahString> {
         let master_address = self.broker_addrs.get(&(mix_all::MASTER_ID)).cloned();
         if master_address.is_none() {
-            return self
-                .broker_addrs
-                .values()
-                .choose(&mut rand::thread_rng())
-                .cloned();
+            return self.broker_addrs.values().choose(&mut rand::rng()).cloned();
         }
         master_address
     }