Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arrow-array/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ ffi = ["arrow-schema/ffi", "arrow-data/ffi"]
force_validate = []

[dev-dependencies]
rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
rand = { version = "0.9", default-features = false, features = ["std", "std_rng"] }
criterion = { version = "0.5", default-features = false }

[[bench]]
Expand Down
2 changes: 1 addition & 1 deletion arrow-avro/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ zstd = { version = "0.13", default-features = false, optional = true }
crc = { version = "3.0", optional = true }

[dev-dependencies]
rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
rand = { version = "0.9", default-features = false, features = ["std", "std_rng"] }
2 changes: 1 addition & 1 deletion arrow-avro/src/reader/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ mod test {
decoder.flush().unwrap()
}

#[test]
#[ignore]
fn test_alltypes() {
let files = [
"avro/alltypes_plain.avro",
Expand Down
2 changes: 1 addition & 1 deletion arrow-buffer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ half = { version = "2.1", default-features = false }

[dev-dependencies]
criterion = { version = "0.5", default-features = false }
rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
rand = { version = "0.9", default-features = false, features = ["std", "std_rng"] }

[[bench]]
name = "bit_mask"
Expand Down
8 changes: 4 additions & 4 deletions arrow-buffer/src/util/bit_chunk_iterator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ impl ExactSizeIterator for BitChunkIterator<'_> {
#[cfg(test)]
mod tests {
use rand::prelude::*;

use rand::rng;
use crate::buffer::Buffer;
use crate::util::bit_chunk_iterator::UnalignedBitChunk;

Expand Down Expand Up @@ -624,7 +624,7 @@ mod tests {
#[test]
#[cfg_attr(miri, ignore)]
fn fuzz_unaligned_bit_chunk_iterator() {
let mut rng = thread_rng();
let mut rng = rng();

for _ in 0..100 {
let mask_len = rng.gen_range(0..1024);
Expand All @@ -635,10 +635,10 @@ mod tests {
let buffer = Buffer::from_iter(bools.iter().cloned());

let max_offset = 64.min(mask_len);
let offset = rng.gen::<usize>().checked_rem(max_offset).unwrap_or(0);
let offset = rng.random_range(0..=usize::MAX).checked_rem(max_offset).unwrap_or(0);

let max_truncate = 128.min(mask_len - offset);
let truncate = rng.gen::<usize>().checked_rem(max_truncate).unwrap_or(0);
let truncate = rng.random_range(0..=usize::MAX).checked_rem(max_truncate).unwrap_or(0);

let unaligned =
UnalignedBitChunk::new(buffer.as_slice(), offset, mask_len - offset - truncate);
Expand Down
9 changes: 5 additions & 4 deletions arrow-buffer/src/util/bit_mask.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use crate::bit_util::ceil;

/// Util function to set bits in a slice of bytes.
///
/// This will sets all bits on `write_data` in the range `[offset_write..offset_write+len]`
/// This will set all bits on `write_data` in the range `[offset_write..offset_write+len]`
/// to be equal to the bits in `data` in the range `[offset_read..offset_read+len]`
/// returns the number of `0` bits `data[offset_read..offset_read+len]`
/// `offset_write`, `offset_read`, and `len` are in terms of bits
Expand Down Expand Up @@ -164,7 +164,7 @@ mod tests {
use super::*;
use crate::bit_util::{get_bit, set_bit, unset_bit};
use rand::prelude::StdRng;
use rand::{Fill, Rng, SeedableRng};
use rand::{Rng, SeedableRng, Fill, RngCore};
use std::fmt::Display;

#[test]
Expand Down Expand Up @@ -356,12 +356,13 @@ mod tests {
self.data
.resize(offset_read_bytes + len + extra_read_data_bytes, 0);
// fill source data with random bytes
self.data.try_fill(rng).unwrap();
rng.fill_bytes(&mut *self.data);
//self.data.try_fill(rng).unwrap();
self.offset_read = offset_read_bits;

self.len = len;

// generated expectated output (not efficient)
// generated expected output (not efficient)
self.expected_data.resize(self.write_data.len(), 0);
self.expected_data.copy_from_slice(&self.write_data);

Expand Down
2 changes: 1 addition & 1 deletion arrow-cast/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ ryu = "1.0.16"
[dev-dependencies]
criterion = { version = "0.5", default-features = false }
half = { version = "2.1", default-features = false }
rand = "0.8"
rand = "0.9"

[[bench]]
name = "parse_timestamp"
Expand Down
2 changes: 1 addition & 1 deletion arrow-json/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ futures = "0.3"
tokio = { version = "1.27", default-features = false, features = ["io-util"] }
bytes = "1.4"
criterion = { version = "0.5", default-features = false }
rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
rand = { version = "0.9", default-features = false, features = ["std", "std_rng"] }

[[bench]]
name = "serde"
Expand Down
2 changes: 1 addition & 1 deletion arrow-ord/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ arrow-select = { workspace = true }

[dev-dependencies]
half = { version = "2.1", default-features = false, features = ["num-traits"] }
rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
rand = { version = "0.9", default-features = false, features = ["std", "std_rng"] }
2 changes: 1 addition & 1 deletion arrow-row/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ half = { version = "2.1", default-features = false }
[dev-dependencies]
arrow-cast = { workspace = true }
arrow-ord = { workspace = true }
rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
rand = { version = "0.9", default-features = false, features = ["std", "std_rng"] }
6 changes: 3 additions & 3 deletions arrow-row/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1438,8 +1438,8 @@ unsafe fn decode_column(

#[cfg(test)]
mod tests {
use rand::distributions::uniform::SampleUniform;
use rand::distributions::{Distribution, Standard};
use rand::distr::uniform::SampleUniform;
use rand::distr::{Distribution, StandardUniform};
use rand::{thread_rng, Rng};

use arrow_array::builder::*;
Expand Down Expand Up @@ -2198,7 +2198,7 @@ mod tests {
fn generate_primitive_array<K>(len: usize, valid_percent: f64) -> PrimitiveArray<K>
where
K: ArrowPrimitiveType,
Standard: Distribution<K::Native>,
StandardUniform: Distribution<K::Native>,
{
let mut rng = thread_rng();
(0..len)
Expand Down
2 changes: 1 addition & 1 deletion arrow-select/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ num = { version = "0.4", default-features = false, features = ["std"] }
ahash = { version = "0.8", default-features = false}

[dev-dependencies]
rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
rand = { version = "0.9", default-features = false, features = ["std", "std_rng"] }
20 changes: 10 additions & 10 deletions arrow-select/src/filter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -861,12 +861,12 @@ fn filter_sparse_union(

#[cfg(test)]
mod tests {
use rand::distr::{Alphanumeric, StandardUniform};
use arrow_array::builder::*;
use arrow_array::cast::as_run_array;
use arrow_array::types::*;
use rand::distributions::{Alphanumeric, Standard};
use rand::prelude::*;

use rand::rng;
use super::*;

macro_rules! def_temporal_test {
Expand Down Expand Up @@ -1475,7 +1475,7 @@ mod tests {
}

fn test_slices_fuzz(mask_len: usize, offset: usize, truncate: usize) {
let mut rng = thread_rng();
let mut rng = rng();

let bools: Vec<bool> = std::iter::from_fn(|| Some(rng.gen()))
.take(mask_len)
Expand Down Expand Up @@ -1516,15 +1516,15 @@ mod tests {
#[test]
#[cfg_attr(miri, ignore)]
fn fuzz_test_slices_iterator() {
let mut rng = thread_rng();
let mut rng = rng();

for _ in 0..100 {
let mask_len = rng.gen_range(0..1024);
let max_offset = 64.min(mask_len);
let offset = rng.gen::<usize>().checked_rem(max_offset).unwrap_or(0);
let offset = rng.random_range(0..=usize::MAX).checked_rem(max_offset).unwrap_or(0);

let max_truncate = 128.min(mask_len - offset);
let truncate = rng.gen::<usize>().checked_rem(max_truncate).unwrap_or(0);
let truncate = rng.random_range(0..=usize::MAX).checked_rem(max_truncate).unwrap_or(0);

test_slices_fuzz(mask_len, offset, truncate);
}
Expand All @@ -1549,9 +1549,9 @@ mod tests {
/// Generates an array of length `len` with `valid_percent` non-null values
fn gen_primitive<T>(len: usize, valid_percent: f64) -> Vec<Option<T>>
where
Standard: Distribution<T>,
StandardUniform: Distribution<T>,
{
let mut rng = thread_rng();
let mut rng = rng();
(0..len)
.map(|_| rng.gen_bool(valid_percent).then(|| rng.gen()))
.collect()
Expand All @@ -1563,7 +1563,7 @@ mod tests {
valid_percent: f64,
str_len_range: std::ops::Range<usize>,
) -> Vec<Option<String>> {
let mut rng = thread_rng();
let mut rng = rng();
(0..len)
.map(|_| {
rng.gen_bool(valid_percent).then(|| {
Expand All @@ -1584,7 +1584,7 @@ mod tests {
#[test]
#[cfg_attr(miri, ignore)]
fn fuzz_filter() {
let mut rng = thread_rng();
let mut rng = rng();

for i in 0..100 {
let filter_percent = match i {
Expand Down
4 changes: 2 additions & 2 deletions arrow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ arrow-schema = { workspace = true }
arrow-select = { workspace = true }
arrow-string = { workspace = true }

rand = { version = "0.8", default-features = false, features = ["std", "std_rng"], optional = true }
rand = { version = "0.9", default-features = false, features = ["std", "std_rng", "thread_rng"], optional = true }
pyo3 = { version = "0.23", default-features = false, optional = true }
half = { version = "2.1", default-features = false, optional = true }

Expand Down Expand Up @@ -86,7 +86,7 @@ canonical_extension_types = ["arrow-schema/canonical_extension_types"]
chrono = { workspace = true }
criterion = { version = "0.5", default-features = false }
half = { version = "2.1", default-features = false }
rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
rand = { version = "0.9", default-features = false, features = ["std", "std_rng"] }
serde = { version = "1.0", default-features = false, features = ["derive"] }
# used in examples
memmap2 = "0.9.3"
Expand Down
23 changes: 11 additions & 12 deletions arrow/src/util/bench_util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@ use crate::datatypes::*;
use crate::util::test_util::seedable_rng;
use arrow_buffer::{Buffer, IntervalMonthDayNano};
use half::f16;
use rand::distributions::uniform::SampleUniform;
use rand::thread_rng;
use rand::Rng;
use rand::distr::uniform::SampleUniform;
use rand::{rng, Rng};
use rand::SeedableRng;
use rand::{
distributions::{Alphanumeric, Distribution, Standard},
distr::{Alphanumeric, Distribution, StandardUniform},
prelude::StdRng,
};
use std::ops::Range;
Expand All @@ -36,7 +35,7 @@ use std::ops::Range;
pub fn create_primitive_array<T>(size: usize, null_density: f32) -> PrimitiveArray<T>
where
T: ArrowPrimitiveType,
Standard: Distribution<T::Native>,
StandardUniform: Distribution<T::Native>,
{
let mut rng = seedable_rng();

Expand All @@ -60,7 +59,7 @@ pub fn create_primitive_array_with_seed<T>(
) -> PrimitiveArray<T>
where
T: ArrowPrimitiveType,
Standard: Distribution<T::Native>,
StandardUniform: Distribution<T::Native>,
{
let mut rng = StdRng::seed_from_u64(seed);

Expand Down Expand Up @@ -98,7 +97,7 @@ pub fn create_month_day_nano_array_with_seed(
/// Creates a random (but fixed-seeded) array of a given size and null density
pub fn create_boolean_array(size: usize, null_density: f32, true_density: f32) -> BooleanArray
where
Standard: Distribution<bool>,
StandardUniform: Distribution<bool>,
{
let mut rng = seedable_rng();
(0..size)
Expand Down Expand Up @@ -296,7 +295,7 @@ pub fn create_string_array_for_runs(
string_len: usize,
) -> Vec<String> {
assert!(logical_array_len >= physical_array_len);
let mut rng = thread_rng();
let mut rng = rng();

// typical length of each run
let run_len = logical_array_len / physical_array_len;
Expand Down Expand Up @@ -336,7 +335,7 @@ pub fn create_binary_array<Offset: OffsetSizeTrait>(
None
} else {
let value = rng
.sample_iter::<u8, _>(Standard)
.sample_iter::<u8, _>(StandardUniform)
.take(range_rng.gen_range(0..8))
.collect::<Vec<u8>>();
Some(value)
Expand All @@ -355,7 +354,7 @@ pub fn create_fsb_array(size: usize, null_density: f32, value_len: usize) -> Fix
None
} else {
let value = rng
.sample_iter::<u8, _>(Standard)
.sample_iter::<u8, _>(StandardUniform)
.take(value_len)
.collect::<Vec<u8>>();
Some(value)
Expand All @@ -375,7 +374,7 @@ pub fn create_dict_from_values<K>(
) -> DictionaryArray<K>
where
K: ArrowDictionaryKeyType,
Standard: Distribution<K::Native>,
StandardUniform: Distribution<K::Native>,
K::Native: SampleUniform,
{
let min_key = K::Native::from_usize(0).unwrap();
Expand All @@ -393,7 +392,7 @@ pub fn create_sparse_dict_from_values<K>(
) -> DictionaryArray<K>
where
K: ArrowDictionaryKeyType,
Standard: Distribution<K::Native>,
StandardUniform: Distribution<K::Native>,
K::Native: SampleUniform,
{
let mut rng = seedable_rng();
Expand Down
4 changes: 2 additions & 2 deletions arrow/src/util/data_gen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

use std::sync::Arc;

use rand::distributions::uniform::SampleRange;
use rand::{distributions::uniform::SampleUniform, Rng};
use rand::distr::uniform::SampleRange;
use rand::{distr::uniform::SampleUniform, Rng};

use crate::array::*;
use crate::error::{ArrowError, Result};
Expand Down
4 changes: 2 additions & 2 deletions object_store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ httparse = { version = "1.8.0", default-features = false, features = ["std"], op
hyper = { version = "1.2", default-features = false, optional = true }
md-5 = { version = "0.10.6", default-features = false, optional = true }
quick-xml = { version = "0.37.0", features = ["serialize", "overlapped-lists"], optional = true }
rand = { version = "0.8", default-features = false, features = ["std", "std_rng"], optional = true }
rand = { version = "0.9", default-features = false, features = ["std", "std_rng"], optional = true }
reqwest = { version = "0.12", default-features = false, features = ["rustls-tls-native-roots", "http2"], optional = true }
ring = { version = "0.17", default-features = false, features = ["std"], optional = true }
rustls-pemfile = { version = "2.0", default-features = false, features = ["std"], optional = true }
Expand All @@ -78,7 +78,7 @@ integration = []
[dev-dependencies] # In alphabetical order
hyper = { version = "1.2", features = ["server"] }
hyper-util = "0.1"
rand = "0.8"
rand = "0.9"
tempfile = "3.1.0"
regex = "1.11.1"
# The "gzip" feature for reqwest is enabled for an integration test.
Expand Down
2 changes: 1 addition & 1 deletion parquet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ zstd = { version = "0.13", default-features = false }
serde_json = { version = "1.0", features = ["std"], default-features = false }
arrow = { workspace = true, features = ["ipc", "test_utils", "prettyprint", "json"] }
tokio = { version = "1.0", default-features = false, features = ["macros", "rt-multi-thread", "io-util", "fs"] }
rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
rand = { version = "0.9", default-features = false, features = ["std", "std_rng"] }
object_store = { version = "0.11.0", default-features = false, features = ["azure"] }

[package.metadata.docs.rs]
Expand Down
2 changes: 1 addition & 1 deletion parquet/src/arrow/array_reader/primitive_array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ mod tests {
use arrow_array::{Array, Date32Array, PrimitiveArray};

use arrow::datatypes::DataType::{Date32, Decimal128};
use rand::distributions::uniform::SampleUniform;
use rand::distr::uniform::SampleUniform;
use std::collections::VecDeque;

#[allow(clippy::too_many_arguments)]
Expand Down
3 changes: 2 additions & 1 deletion parquet/src/arrow/buffer/bit_util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,11 @@ mod tests {
use super::*;
use arrow_array::builder::BooleanBufferBuilder;
use rand::prelude::*;
use rand::rng;

#[test]
fn test_bit_fns() {
let mut rng = thread_rng();
let mut rng = rng();
let mask_length = rng.gen_range(1..1024);
let bools: Vec<_> = std::iter::from_fn(|| Some(rng.next_u32() & 1 == 0))
.take(mask_length)
Expand Down
Loading
Loading