Update to rand 0.9.2

Author: teskje

Cargo.lock

@@ -78,8 +78,8 @@ opentelemetry = { version = "0.24.0", features = ["trace"] }
 prometheus = { version = "0.14.0", default-features = false }
 prost = { version = "0.13.5", features = ["no-recursion-limit"] }
 qcell = "0.5"
-rand = "0.8.5"
-rand_chacha = "0.3"
+rand = "0.9.2"
+rand_chacha = "0.9.0"
 semver = "1.0.27"
 serde = "1.0.219"
 serde_json = "1.0.145"

src/adapter/Cargo.toml

@@ -48,7 +48,7 @@ fn test_builtin_schema_migration() {
 
     let mut sim = turmoil::Builder::new()
         .enable_random_order()
-        .rng_seed(rng.r#gen())
+        .rng_seed(rng.random())
         .build();
 
     // Keep a list of all hosts, so we can randomly crash them.
@@ -60,7 +60,7 @@ fn test_builtin_schema_migration() {
     // Generate system objects at version 0.
     let mut system_objects = BTreeMap::new();
     for i in 0..NUM_BUILTINS {
-        let (object, builtin) = match rng.r#gen::<bool>() {
+        let (object, builtin) = match rng.random::<bool>() {
             true => make_builtin_table(format!("table{i}")),
             false => make_builtin_source(format!("source{i}")),
         };
@@ -90,12 +90,12 @@ fn test_builtin_schema_migration() {
     for generation in 1..=NUM_VERSIONS {
         let version = Version::new(0, generation, 0);
 
-        for _ in 0..rng.gen_range(0..=MAX_MIGRATIONS_PER_VERSION) {
+        for _ in 0..rng.random_range(0..=MAX_MIGRATIONS_PER_VERSION) {
             let (object, info) = system_objects.iter_mut().choose(&mut rng).unwrap();
 
             info.builtin = evolve_builtin_desc(info.builtin);
 
-            let mechanism = match rng.r#gen::<bool>() {
+            let mechanism = match rng.random::<bool>() {
                 true => Mechanism::Evolution,
                 false => Mechanism::Replacement,
             };
@@ -111,7 +111,7 @@ fn test_builtin_schema_migration() {
             migrations.push(step);
         }
 
-        for i in 0..rng.gen_range(0..=MAX_PROCESSES_PER_VERSION) {
+        for i in 0..rng.random_range(0..=MAX_PROCESSES_PER_VERSION) {
             let version = version.clone();
             let system_objects = system_objects.clone();
             let migrations = migrations.clone();
@@ -197,7 +197,7 @@ fn test_builtin_schema_migration() {
             sim.step().unwrap();
 
             // Randomly crash running processes.
-            if rng.gen_bool(CRASH_PROBABILITY) {
+            if rng.random_bool(CRASH_PROBABILITY) {
                 let victim = all_hosts.iter().choose(&mut rng).unwrap().clone();
                 if sim.is_host_running(victim.clone()) {
                     sim.bounce(victim);

src/adapter/src/catalog/open/builtin_schema_migration_tests.rs

@@ -314,7 +314,7 @@ impl Coordinator {
             EpochMillis::try_from(self.storage_usage_collection_interval.as_millis())
                 .expect("storage usage collection interval must fit into u64");
         let offset =
-            rngs::SmallRng::from_seed(seed).gen_range(0..storage_usage_collection_interval_ms);
+            rngs::SmallRng::from_seed(seed).random_range(0..storage_usage_collection_interval_ms);
         let now_ts: EpochMillis = self.peek_local_write_ts().await.into();
 
         // 2) Determine the amount of ms between now and the next collection time.

src/adapter/src/coord/message_handler.rs

@@ -26,7 +26,7 @@ use mz_sql_parser::ast::{StatementKind, statement_kind_label_value};
 use mz_storage_client::controller::IntrospectionType;
 use qcell::QCell;
 use rand::SeedableRng;
-use rand::{distributions::Bernoulli, prelude::Distribution, thread_rng};
+use rand::distr::{Bernoulli, Distribution};
 use sha2::{Digest, Sha256};
 use tokio::time::MissedTickBehavior;
 use tracing::debug;
@@ -138,7 +138,7 @@ pub(crate) struct StatementLogging {
     unlogged_sessions: BTreeMap<Uuid, SessionHistoryEvent>,
 
     /// A reproducible RNG for deciding whether to sample statement executions.
-    /// Only used by tests; otherwise, `rand::thread_rng()` is used.
+    /// Only used by tests; otherwise, `rand::rng()` is used.
     /// Controlled by the system var `statement_logging_use_reproducible_rng`.
     reproducible_rng: rand_chacha::ChaCha8Rng,
 
@@ -697,7 +697,7 @@ impl Coordinator {
         {
             distribution.sample(&mut self.statement_logging.reproducible_rng)
         } else {
-            distribution.sample(&mut thread_rng())
+            distribution.sample(&mut rand::rng())
         };
 
         // Track how many statements we're recording.

src/adapter/src/coord/statement_logging.rs

@@ -47,7 +47,6 @@ use mz_sql_parser::ast::TransactionIsolationLevel;
 use mz_storage_client::client::TableData;
 use mz_storage_types::sources::Timeline;
 use qcell::{QCell, QCellOwner};
-use rand::Rng;
 use tokio::sync::mpsc::{self, UnboundedReceiver, UnboundedSender};
 use tokio::sync::watch;
 use uuid::Uuid;
@@ -346,7 +345,7 @@ impl<T: TimestampManipulation> Session<T> {
             notices_tx,
             notices_rx,
             next_transaction_id: 0,
-            secret_key: rand::thread_rng().r#gen(),
+            secret_key: rand::random(),
             external_metadata_rx,
             qcell_owner: QCellOwner::new(),
             session_oracles: BTreeMap::new(),

src/adapter/src/session.rs

@@ -24,7 +24,7 @@ enum-kinds = "0.5.1"
 flate2 = "1.1.5"
 itertools = "0.14.0"
 mz-ore = { path = "../ore", features = ["test"] }
-rand = "0.8.5"
+rand = "0.9.2"
 regex = "1.12.2"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.145"

src/avro/Cargo.toml

@@ -56,7 +56,7 @@ prometheus = { version = "0.14.0", default-features = false }
 proptest = { version = "1.7.0", default-features = false, features = ["std"] }
 proptest-derive = { version = "0.7.0", features = ["boxed_union"] }
 prost = "0.13.5"
-rand = "0.8.5"
+rand = "0.9.2"
 semver = { version = "1.0.27" }
 serde = "1.0.219"
 serde_json = "1.0.145"

src/catalog/Cargo.toml

@@ -22,7 +22,7 @@ k8s-openapi = { version = "0.26.0", features = ["schemars", "v1_31"] }
 kube = { version = "2.0.1", default-features = false, features = ["client", "derive", "openssl-tls", "ws", "runtime"] }
 mz-ore = { path = "../ore", default-features = false, features = ["async"] }
 mz-server-core = { path = "../server-core", default-features = false }
-rand = "0.8.5"
+rand = "0.9.2"
 schemars = { version = "1.1.0", features = ["uuid1"] }
 semver = "1.0.27"
 serde = "1.0.219"

src/cloud-resources/Cargo.toml

@@ -18,7 +18,7 @@ use k8s_openapi::{
 };
 use kube::{CustomResource, Resource, ResourceExt, api::ObjectMeta};
 use rand::Rng;
-use rand::distributions::Uniform;
+use rand::distr::Uniform;
 use schemars::JsonSchema;
 use semver::Version;
 use serde::{Deserialize, Serialize};
@@ -497,8 +497,8 @@ pub mod v1alpha1 {
                 // built-in Alphanumeric distribution from rand, which
                 // includes both upper and lowercase letters.
                 const CHARSET: &[u8] = b"abcdefghijklmnopqrstuvwxyz0123456789";
-                status.resource_id = rand::thread_rng()
-                    .sample_iter(Uniform::new(0, CHARSET.len()))
+                status.resource_id = rand::rng()
+                    .sample_iter(Uniform::new(0, CHARSET.len()).expect("valid range"))
                     .take(10)
                     .map(|i| char::from(CHARSET[i]))
                     .collect();