oss/lseq
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: upgrade everywhere to rand 0.9

Browse source
This commit is contained in:
nobody 2025-12-12 21:34:06 -08:00
commit 8911e582d8
Signed by: GrocerPublishAgent
GPG key ID: D460CD54A9E3AB86
10 changed files with 65 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

53
research/Cargo.lock generated
View file

@ -203,17 +203,6 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
[[package]]
name = "getrandom"
version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
dependencies = [
"cfg-if 1.0.1",
"libc",
"wasi",
]
[[package]]
name = "getrandom"
version = "0.3.4"
@ -439,7 +428,7 @@ dependencies = [
"log",
"lseq",
"peoplesgrocers-lseq",
"rand 0.8.5",
"rand 0.9.2",
]
[[package]]
@ -526,37 +515,16 @@ dependencies = [
"winapi",
]
[[package]]
name = "rand"
version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
dependencies = [
"libc",
"rand_chacha 0.3.1",
"rand_core 0.6.4",
]
[[package]]
name = "rand"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
dependencies = [
"rand_chacha 0.9.0",
"rand_chacha",
"rand_core 0.9.3",
]
[[package]]
name = "rand_chacha"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
dependencies = [
"ppv-lite86",
"rand_core 0.6.4",
]
[[package]]
name = "rand_chacha"
version = "0.9.0"
@ -582,22 +550,13 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
[[package]]
name = "rand_core"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
"getrandom 0.2.16",
]
[[package]]
name = "rand_core"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
dependencies = [
"getrandom 0.3.4",
"getrandom",
]
[[package]]
@ -795,12 +754,6 @@ dependencies = [
"winapi-util",
]
[[package]]
name = "wasi"
version = "0.11.1+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
[[package]]
name = "wasip2"
version = "1.0.1+wasi-0.2.4"

2
research/Cargo.toml
View file

@ -5,7 +5,7 @@ edition = "2021"
[dependencies]
peoplesgrocers-lseq = { path = "../rust" }
rand = "0.8"
rand = "0.9"
log = "0.4"
env_logger = "0.10"

8
research/benches/lseq_benchmarks.rs
View file

@ -118,7 +118,7 @@ fn benchmark_random_insertions(c: &mut Criterion) {
let key = lseq.allocate(None, None).unwrap();
keys.push(key);
} else {
let idx = rng.gen_range(0..keys.len());
let idx = rng.random_range(0..keys.len());
let before = if idx == 0 { None } else { Some(&keys[idx - 1]) };
let after = if idx == keys.len() { None } else { Some(&keys[idx]) };
@ -147,7 +147,7 @@ fn benchmark_random_insertions(c: &mut Criterion) {
let key = lseq.alloc(None, None);
keys.push(key);
} else {
let idx = rng.gen_range(0..keys.len());
let idx = rng.random_range(0..keys.len());
let before = if idx == 0 { None } else { Some(&keys[idx - 1]) };
let after = if idx == keys.len() { None } else { Some(&keys[idx]) };
@ -176,7 +176,7 @@ fn benchmark_random_insertions(c: &mut Criterion) {
let key = lseq.allocate(None, None).unwrap();
keys.push(key);
} else {
let idx = rng.gen_range(0..keys.len());
let idx = rng.random_range(0..keys.len());
let before = if idx == 0 { None } else { Some(&keys[idx - 1]) };
let after = if idx == keys.len() { None } else { Some(&keys[idx]) };
@ -206,7 +206,7 @@ fn benchmark_random_insertions(c: &mut Criterion) {
let key = lseq.allocate(None, None);
keys.push(key);
} else {
let idx = rng.gen_range(0..keys.len());
let idx = rng.random_range(0..keys.len());
let before = if idx == 0 { None } else { Some(&keys[idx - 1]) };
let after = if idx == keys.len() { None } else { Some(&keys[idx]) };

12
research/src/algorithms/lseq_base64.rs
View file

@ -190,7 +190,7 @@ impl<R: Rng + std::fmt::Debug> LSEQBase64<R> {
trace!("Current carry_flag: {}", borrow_flag);
if self.strategies.len() <= depth {
let new_strategy = self.rng.gen_bool(0.5);
let new_strategy = self.rng.random_bool(0.5);
trace!("BRANCH: Generating new strategy for depth {}: {} (+ strategy: {})",
depth, new_strategy, new_strategy);
self.strategies.push(new_strategy);
@ -245,18 +245,18 @@ impl<R: Rng + std::fmt::Debug> LSEQBase64<R> {
let step = std::cmp::min(BOUNDARY, interval);
let allocated_value = if self.strategies[depth] {
let delta = self.rng.gen_range(1..=step);
let delta = self.rng.random_range(1..=step);
trace!("Space allocation: interval={}, step={}, delta={}", interval, step, delta);
let val = p_val + delta;
trace!("BRANCH: Using + strategy, allocated_value = p_val + delta = {} + {} = {}",
trace!("BRANCH: Using + strategy, allocated_value = p_val + delta = {} + {} = {}",
p_val, delta, val);
val
} else {
let delta = if borrow_flag {
//self.rng.gen_range(0..step)
self.rng.gen_range(1..=step)
//self.rng.random_range(0..step)
self.rng.random_range(1..=step)
} else {
self.rng.gen_range(1..=step)
self.rng.random_range(1..=step)
};
trace!("Space allocation: interval={}, step={}, delta={}", interval, step, delta);
let val = q_val - delta;

10
research/src/algorithms/original_paper_reference_impl.rs
View file

@ -187,7 +187,7 @@ impl<R: Rng> ReferenceLSEQ<R> {
trace!("Current carry_flag: {}", borrow_flag);
if self.strategies.len() <= depth {
let new_strategy = self.rng.gen_bool(0.5);
let new_strategy = self.rng.random_bool(0.5);
trace!("BRANCH: Generating new strategy for depth {}: {} (+ strategy: {})",
depth, new_strategy, new_strategy);
self.strategies.push(new_strategy);
@ -241,17 +241,17 @@ impl<R: Rng> ReferenceLSEQ<R> {
let step = std::cmp::min(BOUNDARY, interval);
let allocated_value = if self.strategies[depth] {
let delta = self.rng.gen_range(1..=step);
let delta = self.rng.random_range(1..=step);
trace!("Space allocation: interval={}, step={}, delta={}", interval, step, delta);
let val = p_val + delta;
trace!("BRANCH: Using + strategy, allocated_value = p_val + delta = {} + {} = {}",
trace!("BRANCH: Using + strategy, allocated_value = p_val + delta = {} + {} = {}",
p_val, delta, val);
val
} else {
let delta = if borrow_flag {
self.rng.gen_range(1..=step)
self.rng.random_range(1..=step)
} else {
self.rng.gen_range(1..=step)
self.rng.random_range(1..=step)
};
trace!("Space allocation: interval={}, step={}, delta={}", interval, step, delta);
let val = q_val - delta;

2
research/src/bin/encoding_analyzer.rs
View file

@ -97,7 +97,7 @@ fn generate_insertion_positions(count: usize, rng: &mut StdRng) -> Vec<usize> {
positions.push(0); // First element always goes at position 0
} else {
// Insert after position 0 to i-1 (current list has i elements)
positions.push(rng.gen_range(0..i));
positions.push(rng.random_range(0..i));
}
}