You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datafusion.apache.org by co...@apache.org on 2025/05/21 21:28:15 UTC
(datafusion) branch main updated: chore: Upgrade rand crate and some other minor crates (#16062)
This is an automated email from the ASF dual-hosted git repository.
comphead pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new 56695003ff chore: Upgrade rand crate and some other minor crates (#16062)
56695003ff is described below
commit 56695003ff31e9e21462ac8cda0d74cf8b09aa6c
Author: Oleks V <co...@users.noreply.github.com>
AuthorDate: Wed May 21 14:28:05 2025 -0700
chore: Upgrade rand crate and some other minor crates (#16062)
* chore: Upgrade `rand` crate and some other minor crates
---------
Co-authored-by: Andrew Lamb <an...@nerdnetworks.org>
---
.github/workflows/rust.yml | 4 +-
Cargo.lock | 1197 ++++++++++----------
Cargo.toml | 6 +-
benchmarks/src/cancellation.rs | 10 +-
datafusion/catalog-listing/Cargo.toml | 1 -
datafusion/common/src/scalar/mod.rs | 38 +-
datafusion/core/Cargo.toml | 4 +-
datafusion/core/benches/data_utils/mod.rs | 27 +-
datafusion/core/benches/map_query_sql.rs | 6 +-
datafusion/core/benches/parquet_query_sql.rs | 23 +-
datafusion/core/benches/sort.rs | 8 +-
datafusion/core/benches/sql_query_with_io.rs | 2 +-
datafusion/core/tests/dataframe/mod.rs | 141 ++-
datafusion/core/tests/fuzz_cases/aggregate_fuzz.rs | 22 +-
.../aggregation_fuzzer/context_generator.rs | 12 +-
.../tests/fuzz_cases/aggregation_fuzzer/fuzzer.rs | 6 +-
.../fuzz_cases/aggregation_fuzzer/query_builder.rs | 26 +-
.../core/tests/fuzz_cases/equivalence/utils.rs | 6 +-
datafusion/core/tests/fuzz_cases/join_fuzz.rs | 4 +-
datafusion/core/tests/fuzz_cases/limit_fuzz.rs | 30 +-
datafusion/core/tests/fuzz_cases/pruning.rs | 4 +-
.../tests/fuzz_cases/record_batch_generator.rs | 39 +-
datafusion/core/tests/fuzz_cases/sort_fuzz.rs | 21 +-
.../fuzz_cases/sort_preserving_repartition_fuzz.rs | 14 +-
.../core/tests/fuzz_cases/sort_query_fuzz.rs | 44 +-
datafusion/core/tests/fuzz_cases/window_fuzz.rs | 40 +-
datafusion/core/tests/memory_limit/mod.rs | 9 +-
datafusion/core/tests/parquet/filter_pushdown.rs | 49 +-
datafusion/datasource/src/write/demux.rs | 8 +-
datafusion/execution/src/disk_manager.rs | 4 +-
.../src/aggregate/groups_accumulator/accumulate.rs | 18 +-
.../functions-aggregate/benches/array_agg.rs | 20 +-
datafusion/functions-aggregate/src/min_max.rs | 4 +-
datafusion/functions-nested/benches/map.rs | 8 +-
datafusion/functions/benches/chr.rs | 6 +-
datafusion/functions/benches/date_bin.rs | 4 +-
datafusion/functions/benches/date_trunc.rs | 4 +-
datafusion/functions/benches/find_in_set.rs | 8 +-
datafusion/functions/benches/gcd.rs | 4 +-
datafusion/functions/benches/helper.rs | 6 +-
datafusion/functions/benches/ltrim.rs | 10 +-
datafusion/functions/benches/make_date.rs | 12 +-
datafusion/functions/benches/pad.rs | 8 +-
datafusion/functions/benches/regx.rs | 22 +-
datafusion/functions/benches/strpos.rs | 10 +-
datafusion/functions/benches/substr_index.rs | 10 +-
datafusion/functions/benches/to_char.rs | 8 +-
datafusion/functions/src/math/random.rs | 6 +-
datafusion/functions/src/string/uuid.rs | 2 +-
datafusion/physical-expr/benches/in_list.rs | 12 +-
.../physical-expr/src/intervals/cp_solver.rs | 8 +-
datafusion/physical-plan/src/joins/test_utils.rs | 4 +-
datafusion/proto/Cargo.toml | 1 -
datafusion/wasmtest/Cargo.toml | 5 +-
test-utils/src/array_gen/binary.rs | 12 +-
test-utils/src/array_gen/boolean.rs | 6 +-
test-utils/src/array_gen/decimal.rs | 4 +-
test-utils/src/array_gen/primitive.rs | 9 +-
test-utils/src/array_gen/random_data.rs | 22 +-
test-utils/src/array_gen/string.rs | 15 +-
test-utils/src/data_gen.rs | 33 +-
test-utils/src/lib.rs | 6 +-
test-utils/src/string_gen.rs | 14 +-
63 files changed, 1076 insertions(+), 1050 deletions(-)
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index f3b7e19a49..2463b04b33 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -401,8 +401,8 @@ jobs:
- name: Run tests with headless mode
working-directory: ./datafusion/wasmtest
run: |
- wasm-pack test --headless --firefox
- wasm-pack test --headless --chrome --chromedriver $CHROMEWEBDRIVER/chromedriver
+ RUSTFLAGS='--cfg getrandom_backend="wasm_js"' wasm-pack test --headless --firefox
+ RUSTFLAGS='--cfg getrandom_backend="wasm_js"' wasm-pack test --headless --chrome --chromedriver $CHROMEWEBDRIVER/chromedriver
# verify that the benchmark queries return the correct results
verify-benchmark-results:
diff --git a/Cargo.lock b/Cargo.lock
index f0d306f3f3..37d67fff9c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -77,23 +77,23 @@ version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
"once_cell",
"version_check",
]
[[package]]
name = "ahash"
-version = "0.8.11"
+version = "0.8.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
dependencies = [
"cfg-if",
"const-random",
- "getrandom 0.2.15",
+ "getrandom 0.3.3",
"once_cell",
"version_check",
- "zerocopy 0.7.35",
+ "zerocopy",
]
[[package]]
@@ -199,9 +199,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.95"
+version = "1.0.98"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
[[package]]
name = "apache-avro"
@@ -223,8 +223,8 @@ dependencies = [
"serde_bytes",
"serde_json",
"snap",
- "strum 0.26.3",
- "strum_macros 0.26.4",
+ "strum",
+ "strum_macros",
"thiserror 1.0.69",
"typed-builder",
"uuid",
@@ -265,7 +265,7 @@ dependencies = [
"arrow-string",
"half",
"pyo3",
- "rand 0.9.0",
+ "rand 0.9.1",
]
[[package]]
@@ -288,14 +288,14 @@ version = "55.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29ed77e22744475a9a53d00026cf8e166fe73cf42d89c4c4ae63607ee1cfcc3f"
dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.12",
"arrow-buffer",
"arrow-data",
"arrow-schema",
"chrono",
"chrono-tz",
"half",
- "hashbrown 0.15.2",
+ "hashbrown 0.15.3",
"num",
]
@@ -454,7 +454,7 @@ version = "55.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73a47aa0c771b5381de2b7f16998d351a6f4eb839f1e13d48353e17e873d969b"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.1",
"serde",
"serde_json",
]
@@ -465,7 +465,7 @@ version = "55.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24b7b85575702b23b85272b01bc1c25a01c9b9852305e5d0078c79ba25d995d4"
dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.12",
"arrow-array",
"arrow-buffer",
"arrow-data",
@@ -552,7 +552,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -574,7 +574,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -585,7 +585,7 @@ checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -611,9 +611,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "aws-config"
-version = "1.6.2"
+version = "1.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6fcc63c9860579e4cb396239570e979376e70aab79e496621748a09913f8b36"
+checksum = "02a18fd934af6ae7ca52410d4548b98eb895aab0f1ea417d168d85db1434a141"
dependencies = [
"aws-credential-types",
"aws-runtime",
@@ -630,7 +630,7 @@ dependencies = [
"bytes",
"fastrand",
"hex",
- "http 1.2.0",
+ "http 1.3.1",
"ring",
"time",
"tokio",
@@ -653,9 +653,9 @@ dependencies = [
[[package]]
name = "aws-lc-rs"
-version = "1.12.6"
+version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dabb68eb3a7aa08b46fddfd59a3d55c978243557a90ab804769f7e20e67d2b01"
+checksum = "93fcc8f365936c834db5514fc45aee5b1202d677e6b40e48468aaaa8183ca8c7"
dependencies = [
"aws-lc-sys",
"zeroize",
@@ -663,9 +663,9 @@ dependencies = [
[[package]]
name = "aws-lc-sys"
-version = "0.27.0"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bbe221bbf523b625a4dd8585c7f38166e31167ec2ca98051dbcb4c3b6e825d2"
+checksum = "61b1d86e7705efe1be1b569bab41d4fa1e14e220b60a160f78de2db687add079"
dependencies = [
"bindgen",
"cc",
@@ -700,9 +700,9 @@ dependencies = [
[[package]]
name = "aws-sdk-sso"
-version = "1.65.0"
+version = "1.70.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8efec445fb78df585327094fcef4cad895b154b58711e504db7a93c41aa27151"
+checksum = "83447efb7179d8e2ad2afb15ceb9c113debbc2ecdf109150e338e2e28b86190b"
dependencies = [
"aws-credential-types",
"aws-runtime",
@@ -716,16 +716,15 @@ dependencies = [
"bytes",
"fastrand",
"http 0.2.12",
- "once_cell",
"regex-lite",
"tracing",
]
[[package]]
name = "aws-sdk-ssooidc"
-version = "1.66.0"
+version = "1.71.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e49cca619c10e7b002dc8e66928ceed66ab7f56c1a3be86c5437bf2d8d89bba"
+checksum = "c5f9bfbbda5e2b9fe330de098f14558ee8b38346408efe9f2e9cee82dc1636a4"
dependencies = [
"aws-credential-types",
"aws-runtime",
@@ -739,16 +738,15 @@ dependencies = [
"bytes",
"fastrand",
"http 0.2.12",
- "once_cell",
"regex-lite",
"tracing",
]
[[package]]
name = "aws-sdk-sts"
-version = "1.66.0"
+version = "1.71.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7420479eac0a53f776cc8f0d493841ffe58ad9d9783f3947be7265784471b47a"
+checksum = "e17b984a66491ec08b4f4097af8911251db79296b3e4a763060b45805746264f"
dependencies = [
"aws-credential-types",
"aws-runtime",
@@ -763,16 +761,15 @@ dependencies = [
"aws-types",
"fastrand",
"http 0.2.12",
- "once_cell",
"regex-lite",
"tracing",
]
[[package]]
name = "aws-sigv4"
-version = "1.3.1"
+version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3503af839bd8751d0bdc5a46b9cac93a003a353e635b0c12cf2376b5b53e41ea"
+checksum = "3734aecf9ff79aa401a6ca099d076535ab465ff76b46440cf567c8e70b65dc13"
dependencies = [
"aws-credential-types",
"aws-smithy-http",
@@ -783,7 +780,7 @@ dependencies = [
"hex",
"hmac",
"http 0.2.12",
- "http 1.2.0",
+ "http 1.3.1",
"percent-encoding",
"sha2",
"time",
@@ -813,7 +810,7 @@ dependencies = [
"bytes-utils",
"futures-core",
"http 0.2.12",
- "http 1.2.0",
+ "http 1.3.1",
"http-body 0.4.6",
"percent-encoding",
"pin-project-lite",
@@ -823,15 +820,15 @@ dependencies = [
[[package]]
name = "aws-smithy-http-client"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8aff1159006441d02e57204bf57a1b890ba68bedb6904ffd2873c1c4c11c546b"
+checksum = "7e44697a9bded898dcd0b1cb997430d949b87f4f8940d91023ae9062bf218250"
dependencies = [
"aws-smithy-async",
"aws-smithy-runtime-api",
"aws-smithy-types",
"h2",
- "http 1.2.0",
+ "http 1.3.1",
"hyper",
"hyper-rustls",
"hyper-util",
@@ -887,7 +884,7 @@ dependencies = [
"bytes",
"fastrand",
"http 0.2.12",
- "http 1.2.0",
+ "http 1.3.1",
"http-body 0.4.6",
"http-body 1.0.1",
"pin-project-lite",
@@ -906,7 +903,7 @@ dependencies = [
"aws-smithy-types",
"bytes",
"http 0.2.12",
- "http 1.2.0",
+ "http 1.3.1",
"pin-project-lite",
"tokio",
"tracing",
@@ -923,7 +920,7 @@ dependencies = [
"bytes",
"bytes-utils",
"http 0.2.12",
- "http 1.2.0",
+ "http 1.3.1",
"http-body 0.4.6",
"http-body 1.0.1",
"http-body-util",
@@ -969,7 +966,7 @@ dependencies = [
"axum-core",
"bytes",
"futures-util",
- "http 1.2.0",
+ "http 1.3.1",
"http-body 1.0.1",
"http-body-util",
"itoa",
@@ -995,7 +992,7 @@ dependencies = [
"async-trait",
"bytes",
"futures-util",
- "http 1.2.0",
+ "http 1.3.1",
"http-body 1.0.1",
"http-body-util",
"mime",
@@ -1008,9 +1005,9 @@ dependencies = [
[[package]]
name = "backtrace"
-version = "0.3.74"
+version = "0.3.75"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
dependencies = [
"addr2line",
"cfg-if",
@@ -1018,7 +1015,7 @@ dependencies = [
"miniz_oxide",
"object",
"rustc-demangle",
- "windows-targets",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -1063,10 +1060,10 @@ version = "0.69.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.1",
"cexpr",
"clang-sys",
- "itertools 0.10.5",
+ "itertools 0.12.1",
"lazy_static",
"lazycell",
"log",
@@ -1076,21 +1073,21 @@ dependencies = [
"regex",
"rustc-hash 1.1.0",
"shlex",
- "syn 2.0.100",
+ "syn 2.0.101",
"which",
]
[[package]]
name = "bitflags"
-version = "1.2.1"
+version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.8.0"
+version = "2.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
[[package]]
name = "bitvec"
@@ -1148,7 +1145,7 @@ dependencies = [
"futures-util",
"hex",
"home",
- "http 1.2.0",
+ "http 1.3.1",
"http-body-util",
"hyper",
"hyper-named-pipe",
@@ -1187,9 +1184,9 @@ dependencies = [
[[package]]
name = "borsh"
-version = "1.5.5"
+version = "1.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5430e3be710b68d984d1391c854eb431a9d548640711faa54eecb1df93db91cc"
+checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce"
dependencies = [
"borsh-derive",
"cfg_aliases",
@@ -1197,15 +1194,15 @@ dependencies = [
[[package]]
name = "borsh-derive"
-version = "1.5.5"
+version = "1.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8b668d39970baad5356d7c83a86fee3a539e6f93bf6764c97368243e17a0487"
+checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3"
dependencies = [
"once_cell",
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -1231,9 +1228,9 @@ dependencies = [
[[package]]
name = "bstr"
-version = "1.11.3"
+version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0"
+checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
dependencies = [
"memchr",
"regex-automata",
@@ -1327,9 +1324,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
[[package]]
name = "cc"
-version = "1.2.14"
+version = "1.2.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c3d1b2e905a3a7b00a6141adb0e4c0bb941d11caf55349d863942a1cc44e3c9"
+checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766"
dependencies = [
"jobserver",
"libc",
@@ -1385,9 +1382,9 @@ dependencies = [
[[package]]
name = "chrono-tz-build"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94fea34d77a245229e7746bd2beb786cd2a896f306ff491fb8cecb3074b10a7"
+checksum = "8f10f8c9340e31fc120ff885fcdb54a0b48e474bbd77cab557f0c30a3e569402"
dependencies = [
"parse-zoneinfo",
"phf_codegen",
@@ -1437,16 +1434,16 @@ version = "2.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
dependencies = [
- "bitflags 1.2.1",
+ "bitflags 1.3.2",
"textwrap",
"unicode-width 0.1.14",
]
[[package]]
name = "clap"
-version = "4.5.37"
+version = "4.5.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071"
+checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000"
dependencies = [
"clap_builder",
"clap_derive",
@@ -1454,9 +1451,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.37"
+version = "4.5.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2"
+checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120"
dependencies = [
"anstream",
"anstyle",
@@ -1473,7 +1470,7 @@ dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -1518,9 +1515,9 @@ dependencies = [
[[package]]
name = "console"
-version = "0.15.10"
+version = "0.15.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea3c6ecd8059b57859df5c69830340ed3c41d30e3da0c1cbed90a96ac853041b"
+checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8"
dependencies = [
"encode_unicode",
"libc",
@@ -1554,7 +1551,7 @@ version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
"once_cell",
"tiny-keccak",
]
@@ -1638,7 +1635,7 @@ dependencies = [
"anes",
"cast",
"ciborium",
- "clap 4.5.37",
+ "clap 4.5.38",
"criterion-plot",
"futures",
"is-terminal",
@@ -1740,19 +1737,25 @@ dependencies = [
[[package]]
name = "ctor"
-version = "0.2.9"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501"
+checksum = "a4735f265ba6a1188052ca32d461028a7d1125868be18e287e756019da7607b5"
dependencies = [
- "quote",
- "syn 2.0.100",
+ "ctor-proc-macro",
+ "dtor",
]
+[[package]]
+name = "ctor-proc-macro"
+version = "0.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f211af61d8efdd104f96e57adf5e426ba1bc3ed7a4ead616e15e5881fd79c4d"
+
[[package]]
name = "darling"
-version = "0.20.10"
+version = "0.20.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
dependencies = [
"darling_core",
"darling_macro",
@@ -1760,27 +1763,27 @@ dependencies = [
[[package]]
name = "darling_core"
-version = "0.20.10"
+version = "0.20.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
dependencies = [
"fnv",
"ident_case",
"proc-macro2",
"quote",
"strsim",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
name = "darling_macro"
-version = "0.20.10"
+version = "0.20.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
dependencies = [
"darling_core",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -1856,7 +1859,7 @@ dependencies = [
"parking_lot",
"parquet",
"paste",
- "rand 0.8.5",
+ "rand 0.9.1",
"rand_distr",
"regex",
"rstest",
@@ -1887,7 +1890,7 @@ dependencies = [
"mimalloc",
"object_store",
"parquet",
- "rand 0.8.5",
+ "rand 0.9.1",
"serde",
"serde_json",
"snmalloc-rs",
@@ -1939,7 +1942,6 @@ dependencies = [
"futures",
"log",
"object_store",
- "tempfile",
"tokio",
]
@@ -1952,7 +1954,7 @@ dependencies = [
"async-trait",
"aws-config",
"aws-credential-types",
- "clap 4.5.37",
+ "clap 4.5.38",
"ctor",
"datafusion",
"dirs",
@@ -1976,7 +1978,7 @@ dependencies = [
name = "datafusion-common"
version = "47.0.0"
dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.12",
"apache-avro",
"arrow",
"arrow-ipc",
@@ -1992,7 +1994,7 @@ dependencies = [
"parquet",
"paste",
"pyo3",
- "rand 0.8.5",
+ "rand 0.9.1",
"recursive",
"sqlparser",
"tokio",
@@ -2034,7 +2036,7 @@ dependencies = [
"log",
"object_store",
"parquet",
- "rand 0.8.5",
+ "rand 0.9.1",
"tempfile",
"tokio",
"tokio-util",
@@ -2140,7 +2142,7 @@ dependencies = [
"object_store",
"parking_lot",
"parquet",
- "rand 0.8.5",
+ "rand 0.9.1",
"tokio",
]
@@ -2191,7 +2193,7 @@ dependencies = [
"log",
"object_store",
"parking_lot",
- "rand 0.8.5",
+ "rand 0.9.1",
"tempfile",
"url",
]
@@ -2268,7 +2270,7 @@ dependencies = [
"itertools 0.14.0",
"log",
"md-5",
- "rand 0.8.5",
+ "rand 0.9.1",
"regex",
"sha2",
"tokio",
@@ -2280,7 +2282,7 @@ dependencies = [
name = "datafusion-functions-aggregate"
version = "47.0.0"
dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.12",
"arrow",
"criterion",
"datafusion-common",
@@ -2294,20 +2296,20 @@ dependencies = [
"half",
"log",
"paste",
- "rand 0.8.5",
+ "rand 0.9.1",
]
[[package]]
name = "datafusion-functions-aggregate-common"
version = "47.0.0"
dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.12",
"arrow",
"criterion",
"datafusion-common",
"datafusion-expr-common",
"datafusion-physical-expr-common",
- "rand 0.8.5",
+ "rand 0.9.1",
]
[[package]]
@@ -2328,7 +2330,7 @@ dependencies = [
"itertools 0.14.0",
"log",
"paste",
- "rand 0.8.5",
+ "rand 0.9.1",
]
[[package]]
@@ -2375,7 +2377,7 @@ version = "47.0.0"
dependencies = [
"datafusion-expr",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -2408,7 +2410,7 @@ dependencies = [
name = "datafusion-physical-expr"
version = "47.0.0"
dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.12",
"arrow",
"criterion",
"datafusion-common",
@@ -2425,7 +2427,7 @@ dependencies = [
"log",
"paste",
"petgraph 0.8.1",
- "rand 0.8.5",
+ "rand 0.9.1",
"rstest",
]
@@ -2433,7 +2435,7 @@ dependencies = [
name = "datafusion-physical-expr-common"
version = "47.0.0"
dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.12",
"arrow",
"datafusion-common",
"datafusion-expr-common",
@@ -2464,7 +2466,7 @@ dependencies = [
name = "datafusion-physical-plan"
version = "47.0.0"
dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.12",
"arrow",
"arrow-ord",
"arrow-schema",
@@ -2489,7 +2491,7 @@ dependencies = [
"log",
"parking_lot",
"pin-project-lite",
- "rand 0.8.5",
+ "rand 0.9.1",
"rstest",
"rstest_reuse",
"tempfile",
@@ -2515,7 +2517,6 @@ dependencies = [
"prost",
"serde",
"serde_json",
- "strum 0.27.1",
"tokio",
]
@@ -2601,7 +2602,7 @@ dependencies = [
"bigdecimal",
"bytes",
"chrono",
- "clap 4.5.37",
+ "clap 4.5.38",
"datafusion",
"datafusion-spark",
"env_logger",
@@ -2657,7 +2658,7 @@ dependencies = [
"datafusion-optimizer",
"datafusion-physical-plan",
"datafusion-sql",
- "getrandom 0.2.15",
+ "getrandom 0.3.3",
"insta",
"object_store",
"tokio",
@@ -2668,9 +2669,9 @@ dependencies = [
[[package]]
name = "deranged"
-version = "0.3.11"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
dependencies = [
"powerfmt",
"serde",
@@ -2722,7 +2723,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -2733,15 +2734,30 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
[[package]]
name = "docker_credential"
-version = "1.3.1"
+version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31951f49556e34d90ed28342e1df7e1cb7a229c4cab0aecc627b5d91edd41d07"
+checksum = "1d89dfcba45b4afad7450a99b39e751590463e45c04728cf555d36bb66940de8"
dependencies = [
"base64 0.21.7",
"serde",
"serde_json",
]
+[[package]]
+name = "dtor"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97cbdf2ad6846025e8e25df05171abfb30e3ababa12ee0a0e44b9bbe570633a8"
+dependencies = [
+ "dtor-proc-macro",
+]
+
+[[package]]
+name = "dtor-proc-macro"
+version = "0.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7454e41ff9012c00d53cf7f475c5e3afa3b91b7c90568495495e8d9bf47a1055"
+
[[package]]
name = "dunce"
version = "1.0.5"
@@ -2750,9 +2766,9 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
[[package]]
name = "dyn-clone"
-version = "1.0.18"
+version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feeef44e73baff3a26d371801df019877a9866a8c493d315ab00177843314f35"
+checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005"
[[package]]
name = "educe"
@@ -2763,14 +2779,14 @@ dependencies = [
"enum-ordinalize",
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
name = "either"
-version = "1.13.0"
+version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
[[package]]
name = "encode_unicode"
@@ -2801,7 +2817,7 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -2835,19 +2851,19 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
[[package]]
name = "errno"
-version = "0.3.10"
+version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
dependencies = [
"libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
name = "error-code"
-version = "3.3.1"
+version = "3.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f"
+checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59"
[[package]]
name = "escape8259"
@@ -2880,13 +2896,13 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
[[package]]
name = "fd-lock"
-version = "4.0.2"
+version = "4.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947"
+checksum = "0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78"
dependencies = [
"cfg-if",
- "rustix 0.38.44",
- "windows-sys 0.52.0",
+ "rustix 1.0.7",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -2943,7 +2959,7 @@ version = "25.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1045398c1bfd89168b5fd3f1fc11f6e70b34f6f66300c87d44d3de849463abf1"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.1",
"rustc_version",
]
@@ -2975,9 +2991,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "foldhash"
-version = "0.1.4"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
[[package]]
name = "form_urlencoded"
@@ -3065,7 +3081,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -3141,9 +3157,9 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.15"
+version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
dependencies = [
"cfg-if",
"js-sys",
@@ -3154,14 +3170,16 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.3.1"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
dependencies = [
"cfg-if",
+ "js-sys",
"libc",
- "wasi 0.13.3+wasi-0.2.2",
- "windows-targets",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
+ "wasm-bindgen",
]
[[package]]
@@ -3191,16 +3209,16 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.4.8"
+version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2"
+checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5"
dependencies = [
"atomic-waker",
"bytes",
"fnv",
"futures-core",
"futures-sink",
- "http 1.2.0",
+ "http 1.3.1",
"indexmap 2.9.0",
"slab",
"tokio",
@@ -3234,15 +3252,15 @@ version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.12",
"allocator-api2",
]
[[package]]
name = "hashbrown"
-version = "0.15.2"
+version = "0.15.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
dependencies = [
"allocator-api2",
"equivalent",
@@ -3266,9 +3284,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]]
name = "hermit-abi"
-version = "0.4.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
[[package]]
name = "hex"
@@ -3307,9 +3325,9 @@ dependencies = [
[[package]]
name = "http"
-version = "1.2.0"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
dependencies = [
"bytes",
"fnv",
@@ -3334,27 +3352,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
dependencies = [
"bytes",
- "http 1.2.0",
+ "http 1.3.1",
]
[[package]]
name = "http-body-util"
-version = "0.1.2"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
dependencies = [
"bytes",
- "futures-util",
- "http 1.2.0",
+ "futures-core",
+ "http 1.3.1",
"http-body 1.0.1",
"pin-project-lite",
]
[[package]]
name = "httparse"
-version = "1.10.0"
+version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
[[package]]
name = "httpdate"
@@ -3364,9 +3382,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
[[package]]
name = "humantime"
-version = "2.1.0"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f"
[[package]]
name = "hyper"
@@ -3378,7 +3396,7 @@ dependencies = [
"futures-channel",
"futures-util",
"h2",
- "http 1.2.0",
+ "http 1.3.1",
"http-body 1.0.1",
"httparse",
"httpdate",
@@ -3411,7 +3429,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
dependencies = [
"futures-util",
- "http 1.2.0",
+ "http 1.3.1",
"hyper",
"hyper-util",
"rustls",
@@ -3437,16 +3455,17 @@ dependencies = [
[[package]]
name = "hyper-util"
-version = "0.1.10"
+version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
+checksum = "cf9f1e950e0d9d1d3c47184416723cf29c0d1f93bd8cccf37e4beb6b44f31710"
dependencies = [
"bytes",
"futures-channel",
"futures-util",
- "http 1.2.0",
+ "http 1.3.1",
"http-body 1.0.1",
"hyper",
+ "libc",
"pin-project-lite",
"socket2",
"tokio",
@@ -3471,16 +3490,17 @@ dependencies = [
[[package]]
name = "iana-time-zone"
-version = "0.1.61"
+version = "0.1.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
dependencies = [
"android_system_properties",
"core-foundation-sys",
"iana-time-zone-haiku",
"js-sys",
+ "log",
"wasm-bindgen",
- "windows-core 0.52.0",
+ "windows-core",
]
[[package]]
@@ -3494,21 +3514,22 @@ dependencies = [
[[package]]
name = "icu_collections"
-version = "1.5.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
dependencies = [
"displaydoc",
+ "potential_utf",
"yoke",
"zerofrom",
"zerovec",
]
[[package]]
-name = "icu_locid"
-version = "1.5.0"
+name = "icu_locale_core"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
dependencies = [
"displaydoc",
"litemap",
@@ -3517,31 +3538,11 @@ dependencies = [
"zerovec",
]
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
-
[[package]]
name = "icu_normalizer"
-version = "1.5.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
dependencies = [
"displaydoc",
"icu_collections",
@@ -3549,67 +3550,54 @@ dependencies = [
"icu_properties",
"icu_provider",
"smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
"zerovec",
]
[[package]]
name = "icu_normalizer_data"
-version = "1.5.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
[[package]]
name = "icu_properties"
-version = "1.5.1"
+version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
dependencies = [
"displaydoc",
"icu_collections",
- "icu_locid_transform",
+ "icu_locale_core",
"icu_properties_data",
"icu_provider",
- "tinystr",
+ "potential_utf",
+ "zerotrie",
"zerovec",
]
[[package]]
name = "icu_properties_data"
-version = "1.5.0"
+version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
[[package]]
name = "icu_provider"
-version = "1.5.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
dependencies = [
"displaydoc",
- "icu_locid",
- "icu_provider_macros",
+ "icu_locale_core",
"stable_deref_trait",
"tinystr",
"writeable",
"yoke",
"zerofrom",
+ "zerotrie",
"zerovec",
]
-[[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.100",
-]
-
[[package]]
name = "ident_case"
version = "1.0.1"
@@ -3629,9 +3617,9 @@ dependencies = [
[[package]]
name = "idna_adapter"
-version = "1.2.0"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
dependencies = [
"icu_normalizer",
"icu_properties",
@@ -3655,7 +3643,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
dependencies = [
"equivalent",
- "hashbrown 0.15.2",
+ "hashbrown 0.15.3",
"serde",
]
@@ -3674,9 +3662,9 @@ dependencies = [
[[package]]
name = "indoc"
-version = "2.0.5"
+version = "2.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
+checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
[[package]]
name = "insta"
@@ -3718,13 +3706,13 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
[[package]]
name = "is-terminal"
-version = "0.4.15"
+version = "0.4.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e19b23d53f35ce9f56aebc7d1bb4e6ac1e9c0db7ac85c8d1760c04379edced37"
+checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
dependencies = [
"hermit-abi",
"libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -3742,6 +3730,15 @@ dependencies = [
"either",
]
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
[[package]]
name = "itertools"
version = "0.13.0"
@@ -3762,15 +3759,15 @@ dependencies = [
[[package]]
name = "itoa"
-version = "1.0.14"
+version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
[[package]]
name = "jiff"
-version = "0.2.4"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d699bc6dfc879fb1bf9bdff0d4c56f0884fc6f0d0eb0fba397a6d00cd9a6b85e"
+checksum = "a194df1107f33c79f4f93d02c80798520551949d59dfad22b6157048a88cca93"
dependencies = [
"jiff-static",
"log",
@@ -3781,21 +3778,22 @@ dependencies = [
[[package]]
name = "jiff-static"
-version = "0.2.4"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d16e75759ee0aa64c57a56acbf43916987b20c77373cb7e808979e02b93c9f9"
+checksum = "6c6e1db7ed32c6c71b759497fae34bf7933636f75a251b9e736555da426f6442"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
name = "jobserver"
-version = "0.1.32"
+version = "0.1.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
dependencies = [
+ "getrandom 0.3.3",
"libc",
]
@@ -3932,14 +3930,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c"
dependencies = [
"cfg-if",
- "windows-targets",
+ "windows-targets 0.53.0",
]
[[package]]
name = "libm"
-version = "0.2.11"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
+checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
[[package]]
name = "libmimalloc-sys"
@@ -3957,9 +3955,9 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.1",
"libc",
- "redox_syscall 0.5.8",
+ "redox_syscall 0.5.12",
]
[[package]]
@@ -3970,7 +3968,7 @@ checksum = "5297962ef19edda4ce33aaa484386e0a5b3d7f2f4e037cbeee00503ef6b29d33"
dependencies = [
"anstream",
"anstyle",
- "clap 4.5.37",
+ "clap 4.5.38",
"escape8259",
]
@@ -3991,15 +3989,15 @@ checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
[[package]]
name = "linux-raw-sys"
-version = "0.9.2"
+version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9c683daf087dc577b7506e9695b3d556a9f3849903fa28186283afd6809e9"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
[[package]]
name = "litemap"
-version = "0.7.4"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
[[package]]
name = "lock_api"
@@ -4017,6 +4015,12 @@ version = "0.4.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+[[package]]
+name = "lru-slab"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
+
[[package]]
name = "lz4_flex"
version = "0.11.3"
@@ -4121,9 +4125,9 @@ dependencies = [
[[package]]
name = "multimap"
-version = "0.10.0"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
+checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
[[package]]
name = "nibble_vec"
@@ -4140,7 +4144,7 @@ version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.1",
"cfg-if",
"cfg_aliases",
"libc",
@@ -4152,7 +4156,7 @@ version = "0.30.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.1",
"cfg-if",
"cfg_aliases",
"libc",
@@ -4286,7 +4290,7 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.1",
]
[[package]]
@@ -4310,9 +4314,9 @@ dependencies = [
[[package]]
name = "object_store"
-version = "0.12.0"
+version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9ce831b09395f933addbc56d894d889e4b226eba304d4e7adbab591e26daf1e"
+checksum = "d94ac16b433c0ccf75326388c893d2835ab7457ea35ab8ba5d745c053ef5fa16"
dependencies = [
"async-trait",
"base64 0.22.1",
@@ -4320,7 +4324,7 @@ dependencies = [
"chrono",
"form_urlencoded",
"futures",
- "http 1.2.0",
+ "http 1.3.1",
"http-body-util",
"humantime",
"hyper",
@@ -4329,7 +4333,7 @@ dependencies = [
"parking_lot",
"percent-encoding",
"quick-xml",
- "rand 0.8.5",
+ "rand 0.9.1",
"reqwest",
"ring",
"rustls-pemfile",
@@ -4341,19 +4345,21 @@ dependencies = [
"tracing",
"url",
"walkdir",
+ "wasm-bindgen-futures",
+ "web-time",
]
[[package]]
name = "once_cell"
-version = "1.20.3"
+version = "1.21.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
[[package]]
name = "oorandom"
-version = "11.1.4"
+version = "11.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
+checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
[[package]]
name = "openssl-probe"
@@ -4390,9 +4396,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "owo-colors"
-version = "4.1.0"
+version = "4.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56"
+checksum = "26995317201fa17f3656c36716aed4a7c81743a9634ac4c99c0eeda495db0cec"
[[package]]
name = "parking_lot"
@@ -4412,9 +4418,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall 0.5.8",
+ "redox_syscall 0.5.12",
"smallvec",
- "windows-targets",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -4423,7 +4429,7 @@ version = "55.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be7b2d778f6b841d37083ebdf32e33a524acde1266b5884a8ca29bf00dfa1231"
dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.12",
"arrow-array",
"arrow-buffer",
"arrow-cast",
@@ -4438,7 +4444,7 @@ dependencies = [
"flate2",
"futures",
"half",
- "hashbrown 0.15.2",
+ "hashbrown 0.15.3",
"lz4_flex",
"num",
"num-bigint",
@@ -4475,7 +4481,7 @@ dependencies = [
"regex",
"regex-syntax",
"structmeta",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -4553,7 +4559,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a98c6720655620a521dcc722d0ad66cd8afd5d86e34a89ef691c50b7b24de06"
dependencies = [
"fixedbitset",
- "hashbrown 0.15.2",
+ "hashbrown 0.15.3",
"indexmap 2.9.0",
"serde",
]
@@ -4598,22 +4604,22 @@ dependencies = [
[[package]]
name = "pin-project"
-version = "1.1.9"
+version = "1.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfe2e71e1471fe07709406bf725f710b02927c9c54b2b5b2ec0e8087d97c327d"
+checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.1.9"
+version = "1.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6e859e6e5bd50440ab63c47e3ebabc90f26251f7c73c3d3e837b74a1cc3fa67"
+checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -4630,9 +4636,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pkg-config"
-version = "0.3.31"
+version = "0.3.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
[[package]]
name = "plotters"
@@ -4664,9 +4670,9 @@ dependencies = [
[[package]]
name = "portable-atomic"
-version = "1.10.0"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
+checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
[[package]]
name = "portable-atomic-util"
@@ -4686,7 +4692,7 @@ dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -4702,7 +4708,7 @@ dependencies = [
"hmac",
"md-5",
"memchr",
- "rand 0.9.0",
+ "rand 0.9.1",
"sha2",
"stringprep",
]
@@ -4720,6 +4726,15 @@ dependencies = [
"postgres-protocol",
]
+[[package]]
+name = "potential_utf"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+dependencies = [
+ "zerovec",
+]
+
[[package]]
name = "powerfmt"
version = "0.2.0"
@@ -4728,11 +4743,11 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
[[package]]
name = "ppv-lite86"
-version = "0.2.20"
+version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
dependencies = [
- "zerocopy 0.7.35",
+ "zerocopy",
]
[[package]]
@@ -4772,14 +4787,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6"
dependencies = [
"proc-macro2",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
name = "proc-macro-crate"
-version = "3.2.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
+checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
dependencies = [
"toml_edit",
]
@@ -4843,7 +4858,7 @@ dependencies = [
"prost",
"prost-types",
"regex",
- "syn 2.0.100",
+ "syn 2.0.101",
"tempfile",
]
@@ -4857,7 +4872,7 @@ dependencies = [
"itertools 0.14.0",
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -4880,9 +4895,9 @@ dependencies = [
[[package]]
name = "psm"
-version = "0.1.25"
+version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f58e5423e24c18cc840e1c98370b3993c6649cd1678b4d24318bcf0a083cbe88"
+checksum = "6e944464ec8536cd1beb0bbfd96987eb5e3b72f2ecdafdc5c769a37f1fa2ae1f"
dependencies = [
"cc",
]
@@ -4954,7 +4969,7 @@ dependencies = [
"proc-macro2",
"pyo3-macros-backend",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -4967,7 +4982,7 @@ dependencies = [
"proc-macro2",
"pyo3-build-config",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -4978,9 +4993,9 @@ checksum = "5a651516ddc9168ebd67b24afd085a718be02f8858fe406591b013d101ce2f40"
[[package]]
name = "quick-xml"
-version = "0.37.2"
+version = "0.37.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "165859e9e55f79d67b96c5d96f4e88b6f2695a1972849c15a6a3f5c59fc2c003"
+checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
dependencies = [
"memchr",
"serde",
@@ -4988,11 +5003,12 @@ dependencies = [
[[package]]
name = "quinn"
-version = "0.11.6"
+version = "0.11.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
+checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8"
dependencies = [
"bytes",
+ "cfg_aliases",
"pin-project-lite",
"quinn-proto",
"quinn-udp",
@@ -5002,17 +5018,19 @@ dependencies = [
"thiserror 2.0.12",
"tokio",
"tracing",
+ "web-time",
]
[[package]]
name = "quinn-proto"
-version = "0.11.9"
+version = "0.11.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
+checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e"
dependencies = [
"bytes",
- "getrandom 0.2.15",
- "rand 0.8.5",
+ "getrandom 0.3.3",
+ "lru-slab",
+ "rand 0.9.1",
"ring",
"rustc-hash 2.1.1",
"rustls",
@@ -5026,16 +5044,16 @@ dependencies = [
[[package]]
name = "quinn-udp"
-version = "0.5.10"
+version = "0.5.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e46f3055866785f6b92bc6164b76be02ca8f2eb4b002c0354b28cf4c119e5944"
+checksum = "ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842"
dependencies = [
"cfg_aliases",
"libc",
"once_cell",
"socket2",
"tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -5047,6 +5065,12 @@ dependencies = [
"proc-macro2",
]
+[[package]]
+name = "r-efi"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+
[[package]]
name = "radium"
version = "0.7.0"
@@ -5076,13 +5100,12 @@ dependencies = [
[[package]]
name = "rand"
-version = "0.9.0"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
+checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
dependencies = [
"rand_chacha 0.9.0",
- "rand_core 0.9.1",
- "zerocopy 0.8.18",
+ "rand_core 0.9.3",
]
[[package]]
@@ -5102,7 +5125,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
dependencies = [
"ppv-lite86",
- "rand_core 0.9.1",
+ "rand_core 0.9.3",
]
[[package]]
@@ -5111,27 +5134,26 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
]
[[package]]
name = "rand_core"
-version = "0.9.1"
+version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a88e0da7a2c97baa202165137c158d0a2e824ac465d13d81046727b34cb247d3"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
dependencies = [
- "getrandom 0.3.1",
- "zerocopy 0.8.18",
+ "getrandom 0.3.3",
]
[[package]]
name = "rand_distr"
-version = "0.4.3"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
+checksum = "6a8615d50dcf34fa31f7ab52692afec947c4dd0ab803cc87cb3b0b4570ff7463"
dependencies = [
"num-traits",
- "rand 0.8.5",
+ "rand 0.9.1",
]
[[package]]
@@ -5171,7 +5193,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b"
dependencies = [
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -5180,16 +5202,16 @@ version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
dependencies = [
- "bitflags 1.2.1",
+ "bitflags 1.3.2",
]
[[package]]
name = "redox_syscall"
-version = "0.5.8"
+version = "0.5.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
+checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.1",
]
[[package]]
@@ -5198,7 +5220,7 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
"libredox",
"thiserror 2.0.12",
]
@@ -5244,7 +5266,7 @@ version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ef7fa9ed0256d64a688a3747d0fef7a88851c18a5e1d57f115f38ec2e09366"
dependencies = [
- "hashbrown 0.15.2",
+ "hashbrown 0.15.3",
"memchr",
]
@@ -5274,16 +5296,16 @@ dependencies = [
[[package]]
name = "reqwest"
-version = "0.12.12"
+version = "0.12.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
+checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb"
dependencies = [
"base64 0.22.1",
"bytes",
"futures-core",
"futures-util",
"h2",
- "http 1.2.0",
+ "http 1.3.1",
"http-body 1.0.1",
"http-body-util",
"hyper",
@@ -5320,13 +5342,13 @@ dependencies = [
[[package]]
name = "ring"
-version = "0.17.13"
+version = "0.17.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ac5d832aa16abd7d1def883a8545280c20a60f523a370aa3a9617c2b8550ee"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
dependencies = [
"cc",
"cfg-if",
- "getrandom 0.2.15",
+ "getrandom 0.2.16",
"libc",
"untrusted",
"windows-sys 0.52.0",
@@ -5369,9 +5391,9 @@ checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422"
[[package]]
name = "rstest"
-version = "0.24.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03e905296805ab93e13c1ec3a03f4b6c4f35e9498a3d5fa96dc626d22c03cd89"
+checksum = "6fc39292f8613e913f7df8fa892b8944ceb47c247b78e1b1ae2f09e019be789d"
dependencies = [
"futures-timer",
"futures-util",
@@ -5381,9 +5403,9 @@ dependencies = [
[[package]]
name = "rstest_macros"
-version = "0.24.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef0053bbffce09062bee4bcc499b0fbe7a57b879f1efe088d6d8d4c7adcdef9b"
+checksum = "1f168d99749d307be9de54d23fd226628d99768225ef08f6ffb52e0182a27746"
dependencies = [
"cfg-if",
"glob",
@@ -5393,7 +5415,7 @@ dependencies = [
"regex",
"relative-path",
"rustc_version",
- "syn 2.0.100",
+ "syn 2.0.101",
"unicode-ident",
]
@@ -5405,7 +5427,7 @@ checksum = "b3a8fb4672e840a587a66fc577a5491375df51ddb88f2a2c2a792598c326fe14"
dependencies = [
"quote",
"rand 0.8.5",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -5458,31 +5480,31 @@ version = "0.38.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.1",
"errno",
"libc",
"linux-raw-sys 0.4.15",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
name = "rustix"
-version = "1.0.2"
+version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7178faa4b75a30e269c71e61c353ce2748cf3d76f0c44c393f4e60abf49b825"
+checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.1",
"errno",
"libc",
- "linux-raw-sys 0.9.2",
- "windows-sys 0.52.0",
+ "linux-raw-sys 0.9.4",
+ "windows-sys 0.59.0",
]
[[package]]
name = "rustls"
-version = "0.23.23"
+version = "0.23.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395"
+checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321"
dependencies = [
"aws-lc-rs",
"once_cell",
@@ -5516,18 +5538,19 @@ dependencies = [
[[package]]
name = "rustls-pki-types"
-version = "1.11.0"
+version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
dependencies = [
"web-time",
+ "zeroize",
]
[[package]]
name = "rustls-webpki"
-version = "0.102.8"
+version = "0.103.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435"
dependencies = [
"aws-lc-rs",
"ring",
@@ -5537,9 +5560,9 @@ dependencies = [
[[package]]
name = "rustversion"
-version = "1.0.19"
+version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
+checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
[[package]]
name = "rustyline"
@@ -5547,7 +5570,7 @@ version = "15.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ee1e066dc922e513bda599c6ccb5f3bb2b0ea5870a579448f2622993f0a9a2f"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.1",
"cfg-if",
"clipboard-win",
"fd-lock",
@@ -5565,9 +5588,9 @@ dependencies = [
[[package]]
name = "ryu"
-version = "1.0.19"
+version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
[[package]]
name = "same-file"
@@ -5608,7 +5631,7 @@ dependencies = [
"proc-macro2",
"quote",
"serde_derive_internals",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -5629,7 +5652,7 @@ version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.1",
"core-foundation",
"core-foundation-sys",
"libc",
@@ -5657,9 +5680,9 @@ dependencies = [
[[package]]
name = "seq-macro"
-version = "0.3.5"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"
+checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc"
[[package]]
name = "serde"
@@ -5672,9 +5695,9 @@ dependencies = [
[[package]]
name = "serde_bytes"
-version = "0.11.15"
+version = "0.11.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a"
+checksum = "8437fd221bde2d4ca316d61b90e337e9e702b3820b87d63caa9ba6c02bd06d96"
dependencies = [
"serde",
]
@@ -5687,7 +5710,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -5698,7 +5721,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -5715,13 +5738,13 @@ dependencies = [
[[package]]
name = "serde_repr"
-version = "0.1.19"
+version = "0.1.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
+checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -5733,7 +5756,7 @@ dependencies = [
"proc-macro2",
"quote",
"serde",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -5775,7 +5798,7 @@ dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -5819,9 +5842,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
[[package]]
name = "signal-hook-registry"
-version = "1.4.2"
+version = "1.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
dependencies = [
"libc",
]
@@ -5855,9 +5878,9 @@ dependencies = [
[[package]]
name = "smallvec"
-version = "1.14.0"
+version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
+checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
[[package]]
name = "snap"
@@ -5885,9 +5908,9 @@ dependencies = [
[[package]]
name = "socket2"
-version = "0.5.8"
+version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
+checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
dependencies = [
"libc",
"windows-sys 0.52.0",
@@ -5937,7 +5960,7 @@ checksum = "da5fc6819faabb412da764b99d3b713bb55083c11e7e0c00144d386cd6a1939c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -5948,15 +5971,15 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "stacker"
-version = "0.1.18"
+version = "0.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d08feb8f695b465baed819b03c128dc23f57a694510ab1f06c77f763975685e"
+checksum = "cddb07e32ddb770749da91081d8d0ac3a16f1a569a18b20348cd371f5dead06b"
dependencies = [
"cc",
"cfg-if",
"libc",
"psm",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -5991,7 +6014,7 @@ dependencies = [
"proc-macro2",
"quote",
"structmeta-derive",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -6002,7 +6025,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -6035,15 +6058,6 @@ version = "0.26.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
-[[package]]
-name = "strum"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32"
-dependencies = [
- "strum_macros 0.27.1",
-]
-
[[package]]
name = "strum_macros"
version = "0.26.4"
@@ -6054,27 +6068,14 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
- "syn 2.0.100",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
name = "subst"
-version = "0.3.7"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33e7942675ea19db01ef8cf15a1e6443007208e6c74568bd64162da26d40160d"
+checksum = "0a9a86e5144f63c2d18334698269a8bfae6eece345c70b64821ea5b35054ec99"
dependencies = [
"memchr",
"unicode-width 0.1.14",
@@ -6101,7 +6102,7 @@ dependencies = [
"serde",
"serde_json",
"serde_yaml",
- "syn 2.0.100",
+ "syn 2.0.101",
"typify",
"walkdir",
]
@@ -6125,9 +6126,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.100"
+version = "2.0.101"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
+checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
dependencies = [
"proc-macro2",
"quote",
@@ -6145,13 +6146,13 @@ dependencies = [
[[package]]
name = "synstructure"
-version = "0.13.1"
+version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -6187,10 +6188,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
dependencies = [
"fastrand",
- "getrandom 0.3.1",
+ "getrandom 0.3.3",
"once_cell",
- "rustix 1.0.2",
- "windows-sys 0.52.0",
+ "rustix 1.0.7",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -6207,7 +6208,7 @@ dependencies = [
"chrono-tz",
"datafusion-common",
"env_logger",
- "rand 0.8.5",
+ "rand 0.9.1",
]
[[package]]
@@ -6283,7 +6284,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -6294,7 +6295,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -6320,9 +6321,9 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.37"
+version = "0.3.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
+checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
dependencies = [
"deranged",
"itoa",
@@ -6335,15 +6336,15 @@ dependencies = [
[[package]]
name = "time-core"
-version = "0.1.2"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
[[package]]
name = "time-macros"
-version = "0.2.19"
+version = "0.2.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
+checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
dependencies = [
"num-conv",
"time-core",
@@ -6360,9 +6361,9 @@ dependencies = [
[[package]]
name = "tinystr"
-version = "0.7.6"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
dependencies = [
"displaydoc",
"zerovec",
@@ -6380,9 +6381,9 @@ dependencies = [
[[package]]
name = "tinyvec"
-version = "1.8.1"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
+checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
dependencies = [
"tinyvec_macros",
]
@@ -6395,9 +6396,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.44.2"
+version = "1.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
+checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165"
dependencies = [
"backtrace",
"bytes",
@@ -6419,7 +6420,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -6441,7 +6442,7 @@ dependencies = [
"pin-project-lite",
"postgres-protocol",
"postgres-types",
- "rand 0.9.0",
+ "rand 0.9.1",
"socket2",
"tokio",
"tokio-util",
@@ -6450,9 +6451,9 @@ dependencies = [
[[package]]
name = "tokio-rustls"
-version = "0.26.1"
+version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
+checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
dependencies = [
"rustls",
"tokio",
@@ -6499,15 +6500,15 @@ dependencies = [
[[package]]
name = "toml_datetime"
-version = "0.6.8"
+version = "0.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3"
[[package]]
name = "toml_edit"
-version = "0.22.24"
+version = "0.22.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
+checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e"
dependencies = [
"indexmap 2.9.0",
"toml_datetime",
@@ -6526,7 +6527,7 @@ dependencies = [
"base64 0.22.1",
"bytes",
"h2",
- "http 1.2.0",
+ "http 1.3.1",
"http-body 1.0.1",
"http-body-util",
"hyper",
@@ -6610,7 +6611,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -6708,7 +6709,7 @@ checksum = "f9534daa9fd3ed0bd911d462a37f172228077e7abf18c18a5f67199d959205f8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -6719,9 +6720,9 @@ checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
[[package]]
name = "typify"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e78d615c4cdd3fb2e51a681fcfc3dcda966cf3f9d62ba0a8615517719c1e294"
+checksum = "fcc5bec3cdff70fd542e579aa2e52967833e543a25fae0d14579043d2e868a50"
dependencies = [
"typify-impl",
"typify-macro",
@@ -6729,9 +6730,9 @@ dependencies = [
[[package]]
name = "typify-impl"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7624e168f94eb06e08e611a00b967a366629faed336eb2c5b99b9bdccc8e5a"
+checksum = "b52a67305054e1da6f3d99ad94875dcd0c7c49adbd17b4b64f0eefb7ae5bf8ab"
dependencies = [
"heck 0.5.0",
"log",
@@ -6742,16 +6743,16 @@ dependencies = [
"semver",
"serde",
"serde_json",
- "syn 2.0.100",
+ "syn 2.0.101",
"thiserror 2.0.12",
"unicode-ident",
]
[[package]]
name = "typify-macro"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb29ff8dbd5f96ac4d4b5e26d7801a09f7a7b10a44080e77cd8d1ca075e1edfe"
+checksum = "0ff5799be156e4f635c348c6051d165e1c59997827155133351a8c4d333d9841"
dependencies = [
"proc-macro2",
"quote",
@@ -6760,7 +6761,7 @@ dependencies = [
"serde",
"serde_json",
"serde_tokenstream",
- "syn 2.0.100",
+ "syn 2.0.101",
"typify-impl",
]
@@ -6811,9 +6812,9 @@ checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
[[package]]
name = "unindent"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
+checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
[[package]]
name = "unsafe-libyaml"
@@ -6845,12 +6846,6 @@ version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
-[[package]]
-name = "utf16_iter"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-
[[package]]
name = "utf8_iter"
version = "1.0.4"
@@ -6869,7 +6864,7 @@ version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
dependencies = [
- "getrandom 0.3.1",
+ "getrandom 0.3.3",
"js-sys",
"serde",
"wasm-bindgen",
@@ -6929,9 +6924,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasi"
-version = "0.13.3+wasi-0.2.2"
+version = "0.14.2+wasi-0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
dependencies = [
"wit-bindgen-rt",
]
@@ -6964,7 +6959,7 @@ dependencies = [
"log",
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
"wasm-bindgen-shared",
]
@@ -6999,7 +6994,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -7034,7 +7029,7 @@ checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -7084,11 +7079,11 @@ dependencies = [
[[package]]
name = "whoami"
-version = "1.5.2"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
+checksum = "6994d13118ab492c3c80c1f81928718159254c53c472bf9ce36f8dae4add02a7"
dependencies = [
- "redox_syscall 0.5.8",
+ "redox_syscall 0.5.12",
"wasite",
"web-sys",
]
@@ -7115,7 +7110,7 @@ version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -7131,7 +7126,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5ee8f3d025738cb02bad7868bbb5f8a6327501e870bf51f1b455b0a2454a419"
dependencies = [
"windows-collections",
- "windows-core 0.61.0",
+ "windows-core",
"windows-future",
"windows-link",
"windows-numerics",
@@ -7143,39 +7138,31 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
dependencies = [
- "windows-core 0.61.0",
+ "windows-core",
]
[[package]]
name = "windows-core"
-version = "0.52.0"
+version = "0.61.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.61.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
dependencies = [
"windows-implement",
"windows-interface",
"windows-link",
- "windows-result 0.3.2",
- "windows-strings 0.4.0",
+ "windows-result",
+ "windows-strings 0.4.2",
]
[[package]]
name = "windows-future"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a1d6bbefcb7b60acd19828e1bc965da6fcf18a7e39490c5f8be71e54a19ba32"
+checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
dependencies = [
- "windows-core 0.61.0",
+ "windows-core",
"windows-link",
+ "windows-threading",
]
[[package]]
@@ -7186,7 +7173,7 @@ checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -7197,7 +7184,7 @@ checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -7212,54 +7199,44 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
dependencies = [
- "windows-core 0.61.0",
+ "windows-core",
"windows-link",
]
[[package]]
name = "windows-registry"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
-dependencies = [
- "windows-result 0.2.0",
- "windows-strings 0.1.0",
- "windows-targets",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.2.0"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
dependencies = [
- "windows-targets",
+ "windows-result",
+ "windows-strings 0.3.1",
+ "windows-targets 0.53.0",
]
[[package]]
name = "windows-result"
-version = "0.3.2"
+version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
dependencies = [
"windows-link",
]
[[package]]
name = "windows-strings"
-version = "0.1.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
dependencies = [
- "windows-result 0.2.0",
- "windows-targets",
+ "windows-link",
]
[[package]]
name = "windows-strings"
-version = "0.4.0"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
dependencies = [
"windows-link",
]
@@ -7270,7 +7247,7 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -7279,7 +7256,7 @@ version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -7288,14 +7265,39 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
+dependencies = [
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
+]
+
+[[package]]
+name = "windows-threading"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
+dependencies = [
+ "windows-link",
]
[[package]]
@@ -7304,77 +7306,119 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
[[package]]
name = "windows_aarch64_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
[[package]]
name = "windows_i686_gnu"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
[[package]]
name = "windows_i686_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
[[package]]
name = "windows_i686_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
[[package]]
name = "windows_x86_64_gnu"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
[[package]]
name = "windows_x86_64_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
[[package]]
name = "winnow"
-version = "0.7.2"
+version = "0.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59690dea168f2198d1a3b0cac23b8063efcd11012f10ae4698f284808c8ef603"
+checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec"
dependencies = [
"memchr",
]
[[package]]
name = "wit-bindgen-rt"
-version = "0.33.0"
+version = "0.39.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.1",
]
-[[package]]
-name = "write16"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
-
[[package]]
name = "writeable"
-version = "0.5.5"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
[[package]]
name = "wyz"
@@ -7387,13 +7431,12 @@ dependencies = [
[[package]]
name = "xattr"
-version = "1.4.0"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e105d177a3871454f754b33bb0ee637ecaaac997446375fd3e5d43a2ed00c909"
+checksum = "0d65cbf2f12c15564212d48f4e3dfb87923d25d611f2aed18f4cb23f0413d89e"
dependencies = [
"libc",
- "linux-raw-sys 0.4.15",
- "rustix 0.38.44",
+ "rustix 1.0.7",
]
[[package]]
@@ -7413,9 +7456,9 @@ dependencies = [
[[package]]
name = "yoke"
-version = "0.7.5"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
dependencies = [
"serde",
"stable_deref_trait",
@@ -7425,75 +7468,54 @@ dependencies = [
[[package]]
name = "yoke-derive"
-version = "0.7.5"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
"synstructure",
]
[[package]]
name = "zerocopy"
-version = "0.7.35"
+version = "0.8.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
dependencies = [
- "byteorder",
- "zerocopy-derive 0.7.35",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.8.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79386d31a42a4996e3336b0919ddb90f81112af416270cff95b5f5af22b839c2"
-dependencies = [
- "zerocopy-derive 0.8.18",
+ "zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
-version = "0.7.35"
+version = "0.8.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.8.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76331675d372f91bf8d17e13afbd5fe639200b73d01f0fc748bb059f9cca2db7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
name = "zerofrom"
-version = "0.1.5"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
dependencies = [
"zerofrom-derive",
]
[[package]]
name = "zerofrom-derive"
-version = "0.1.5"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
"synstructure",
]
@@ -7503,11 +7525,22 @@ version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+[[package]]
+name = "zerotrie"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
[[package]]
name = "zerovec"
-version = "0.10.4"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
dependencies = [
"yoke",
"zerofrom",
@@ -7516,13 +7549,13 @@ dependencies = [
[[package]]
name = "zerovec-derive"
-version = "0.10.3"
+version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.100",
+ "syn 2.0.101",
]
[[package]]
@@ -7542,18 +7575,18 @@ dependencies = [
[[package]]
name = "zstd-safe"
-version = "7.2.1"
+version = "7.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059"
+checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
dependencies = [
"zstd-sys",
]
[[package]]
name = "zstd-sys"
-version = "2.0.13+zstd.1.5.6"
+version = "2.0.15+zstd.1.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
+checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
dependencies = [
"cc",
"pkg-config",
diff --git a/Cargo.toml b/Cargo.toml
index 2288f1d770..26ab99e526 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -106,7 +106,7 @@ bigdecimal = "0.4.8"
bytes = "1.10"
chrono = { version = "0.4.41", default-features = false }
criterion = "0.5.1"
-ctor = "0.2.9"
+ctor = "0.4.0"
dashmap = "6.0.1"
datafusion = { path = "datafusion/core", version = "47.0.0", default-features = false }
datafusion-catalog = { path = "datafusion/catalog", version = "47.0.0" }
@@ -161,10 +161,10 @@ pbjson-types = "0.7"
# Should match arrow-flight's version of prost.
insta = { version = "1.43.1", features = ["glob", "filters"] }
prost = "0.13.1"
-rand = "0.8.5"
+rand = "0.9"
recursive = "0.1.1"
regex = "1.8"
-rstest = "0.24.0"
+rstest = "0.25.0"
serde_json = "1"
sqlparser = { version = "0.55.0", features = ["visitor"] }
tempfile = "3"
diff --git a/benchmarks/src/cancellation.rs b/benchmarks/src/cancellation.rs
index f5740bdc96..fcf03fbc54 100644
--- a/benchmarks/src/cancellation.rs
+++ b/benchmarks/src/cancellation.rs
@@ -38,7 +38,7 @@ use futures::TryStreamExt;
use object_store::ObjectStore;
use parquet::arrow::async_writer::ParquetObjectWriter;
use parquet::arrow::AsyncArrowWriter;
-use rand::distributions::Alphanumeric;
+use rand::distr::Alphanumeric;
use rand::rngs::ThreadRng;
use rand::Rng;
use structopt::StructOpt;
@@ -237,7 +237,7 @@ fn find_files_on_disk(data_dir: impl AsRef<Path>) -> Result<Vec<PathBuf>> {
let path = file.unwrap().path();
if path
.extension()
- .map(|ext| (ext == "parquet"))
+ .map(|ext| ext == "parquet")
.unwrap_or(false)
{
Some(path)
@@ -312,15 +312,15 @@ async fn generate_data(
}
fn random_data(column_type: &DataType, rows: usize) -> Arc<dyn Array> {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let values = (0..rows).map(|_| random_value(&mut rng, column_type));
ScalarValue::iter_to_array(values).unwrap()
}
fn random_value(rng: &mut ThreadRng, column_type: &DataType) -> ScalarValue {
match column_type {
- DataType::Float64 => ScalarValue::Float64(Some(rng.gen())),
- DataType::Boolean => ScalarValue::Boolean(Some(rng.gen())),
+ DataType::Float64 => ScalarValue::Float64(Some(rng.random())),
+ DataType::Boolean => ScalarValue::Boolean(Some(rng.random())),
DataType::Utf8 => ScalarValue::Utf8(Some(
rng.sample_iter(&Alphanumeric)
.take(10)
diff --git a/datafusion/catalog-listing/Cargo.toml b/datafusion/catalog-listing/Cargo.toml
index 7345802022..b88461e7eb 100644
--- a/datafusion/catalog-listing/Cargo.toml
+++ b/datafusion/catalog-listing/Cargo.toml
@@ -48,7 +48,6 @@ object_store = { workspace = true }
tokio = { workspace = true }
[dev-dependencies]
-tempfile = { workspace = true }
[lints]
workspace = true
diff --git a/datafusion/common/src/scalar/mod.rs b/datafusion/common/src/scalar/mod.rs
index 6558ea3fe4..8389109f94 100644
--- a/datafusion/common/src/scalar/mod.rs
+++ b/datafusion/common/src/scalar/mod.rs
@@ -7351,14 +7351,14 @@ mod tests {
fn get_random_timestamps(sample_size: u64) -> Vec<ScalarValue> {
let vector_size = sample_size;
let mut timestamp = vec![];
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
for i in 0..vector_size {
- let year = rng.gen_range(1995..=2050);
- let month = rng.gen_range(1..=12);
- let day = rng.gen_range(1..=28); // to exclude invalid dates
- let hour = rng.gen_range(0..=23);
- let minute = rng.gen_range(0..=59);
- let second = rng.gen_range(0..=59);
+ let year = rng.random_range(1995..=2050);
+ let month = rng.random_range(1..=12);
+ let day = rng.random_range(1..=28); // to exclude invalid dates
+ let hour = rng.random_range(0..=23);
+ let minute = rng.random_range(0..=59);
+ let second = rng.random_range(0..=59);
if i % 4 == 0 {
timestamp.push(ScalarValue::TimestampSecond(
Some(
@@ -7372,7 +7372,7 @@ mod tests {
None,
))
} else if i % 4 == 1 {
- let millisec = rng.gen_range(0..=999);
+ let millisec = rng.random_range(0..=999);
timestamp.push(ScalarValue::TimestampMillisecond(
Some(
NaiveDate::from_ymd_opt(year, month, day)
@@ -7385,7 +7385,7 @@ mod tests {
None,
))
} else if i % 4 == 2 {
- let microsec = rng.gen_range(0..=999_999);
+ let microsec = rng.random_range(0..=999_999);
timestamp.push(ScalarValue::TimestampMicrosecond(
Some(
NaiveDate::from_ymd_opt(year, month, day)
@@ -7398,7 +7398,7 @@ mod tests {
None,
))
} else if i % 4 == 3 {
- let nanosec = rng.gen_range(0..=999_999_999);
+ let nanosec = rng.random_range(0..=999_999_999);
timestamp.push(ScalarValue::TimestampNanosecond(
Some(
NaiveDate::from_ymd_opt(year, month, day)
@@ -7422,27 +7422,27 @@ mod tests {
let vector_size = sample_size;
let mut intervals = vec![];
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
const SECS_IN_ONE_DAY: i32 = 86_400;
const MICROSECS_IN_ONE_DAY: i64 = 86_400_000_000;
for i in 0..vector_size {
if i % 4 == 0 {
- let days = rng.gen_range(0..5000);
+ let days = rng.random_range(0..5000);
// to not break second precision
- let millis = rng.gen_range(0..SECS_IN_ONE_DAY) * 1000;
+ let millis = rng.random_range(0..SECS_IN_ONE_DAY) * 1000;
intervals.push(ScalarValue::new_interval_dt(days, millis));
} else if i % 4 == 1 {
- let days = rng.gen_range(0..5000);
- let millisec = rng.gen_range(0..(MILLISECS_IN_ONE_DAY as i32));
+ let days = rng.random_range(0..5000);
+ let millisec = rng.random_range(0..(MILLISECS_IN_ONE_DAY as i32));
intervals.push(ScalarValue::new_interval_dt(days, millisec));
} else if i % 4 == 2 {
- let days = rng.gen_range(0..5000);
+ let days = rng.random_range(0..5000);
// to not break microsec precision
- let nanosec = rng.gen_range(0..MICROSECS_IN_ONE_DAY) * 1000;
+ let nanosec = rng.random_range(0..MICROSECS_IN_ONE_DAY) * 1000;
intervals.push(ScalarValue::new_interval_mdn(0, days, nanosec));
} else {
- let days = rng.gen_range(0..5000);
- let nanosec = rng.gen_range(0..NANOSECS_IN_ONE_DAY);
+ let days = rng.random_range(0..5000);
+ let nanosec = rng.random_range(0..NANOSECS_IN_ONE_DAY);
intervals.push(ScalarValue::new_interval_mdn(0, days, nanosec));
}
}
diff --git a/datafusion/core/Cargo.toml b/datafusion/core/Cargo.toml
index c7cd451562..c0b9932ebd 100644
--- a/datafusion/core/Cargo.toml
+++ b/datafusion/core/Cargo.toml
@@ -117,7 +117,6 @@ datafusion-functions-aggregate = { workspace = true }
datafusion-functions-nested = { workspace = true, optional = true }
datafusion-functions-table = { workspace = true }
datafusion-functions-window = { workspace = true }
-datafusion-macros = { workspace = true }
datafusion-optimizer = { workspace = true }
datafusion-physical-expr = { workspace = true }
datafusion-physical-expr-common = { workspace = true }
@@ -150,13 +149,14 @@ ctor = { workspace = true }
dashmap = "6.1.0"
datafusion-doc = { workspace = true }
datafusion-functions-window-common = { workspace = true }
+datafusion-macros = { workspace = true }
datafusion-physical-optimizer = { workspace = true }
doc-comment = { workspace = true }
env_logger = { workspace = true }
insta = { workspace = true }
paste = "^1.0"
rand = { workspace = true, features = ["small_rng"] }
-rand_distr = "0.4.3"
+rand_distr = "0.5"
regex = { workspace = true }
rstest = { workspace = true }
serde_json = { workspace = true }
diff --git a/datafusion/core/benches/data_utils/mod.rs b/datafusion/core/benches/data_utils/mod.rs
index fc5f8945c4..c0477b1306 100644
--- a/datafusion/core/benches/data_utils/mod.rs
+++ b/datafusion/core/benches/data_utils/mod.rs
@@ -26,8 +26,8 @@ use arrow::datatypes::{DataType, Field, Schema, SchemaRef};
use datafusion::datasource::MemTable;
use datafusion::error::Result;
use datafusion_common::DataFusionError;
+use rand::prelude::IndexedRandom;
use rand::rngs::StdRng;
-use rand::seq::SliceRandom;
use rand::{Rng, SeedableRng};
use rand_distr::Distribution;
use rand_distr::{Normal, Pareto};
@@ -49,11 +49,6 @@ pub fn create_table_provider(
MemTable::try_new(schema, partitions).map(Arc::new)
}
-/// create a seedable [`StdRng`](rand::StdRng)
-fn seedable_rng() -> StdRng {
- StdRng::seed_from_u64(42)
-}
-
/// Create test data schema
pub fn create_schema() -> Schema {
Schema::new(vec![
@@ -73,14 +68,14 @@ pub fn create_schema() -> Schema {
fn create_data(size: usize, null_density: f64) -> Vec<Option<f64>> {
// use random numbers to avoid spurious compiler optimizations wrt to branching
- let mut rng = seedable_rng();
+ let mut rng = StdRng::seed_from_u64(42);
(0..size)
.map(|_| {
- if rng.gen::<f64>() > null_density {
+ if rng.random::<f64>() > null_density {
None
} else {
- Some(rng.gen::<f64>())
+ Some(rng.random::<f64>())
}
})
.collect()
@@ -88,14 +83,14 @@ fn create_data(size: usize, null_density: f64) -> Vec<Option<f64>> {
fn create_integer_data(size: usize, value_density: f64) -> Vec<Option<u64>> {
// use random numbers to avoid spurious compiler optimizations wrt to branching
- let mut rng = seedable_rng();
+ let mut rng = StdRng::seed_from_u64(42);
(0..size)
.map(|_| {
- if rng.gen::<f64>() > value_density {
+ if rng.random::<f64>() > value_density {
None
} else {
- Some(rng.gen::<u64>())
+ Some(rng.random::<u64>())
}
})
.collect()
@@ -125,7 +120,7 @@ fn create_record_batch(
// Integer values between [0, 9].
let integer_values_narrow = (0..batch_size)
- .map(|_| rng.gen_range(0_u64..10))
+ .map(|_| rng.random_range(0_u64..10))
.collect::<Vec<_>>();
RecordBatch::try_new(
@@ -149,7 +144,7 @@ pub fn create_record_batches(
partitions_len: usize,
batch_size: usize,
) -> Vec<Vec<RecordBatch>> {
- let mut rng = seedable_rng();
+ let mut rng = StdRng::seed_from_u64(42);
(0..partitions_len)
.map(|_| {
(0..array_len / batch_size / partitions_len)
@@ -217,7 +212,7 @@ pub(crate) fn make_data(
let mut ts_builder = Int64Builder::new();
let gen_id = |rng: &mut rand::rngs::SmallRng| {
- rng.gen::<[u8; 16]>()
+ rng.random::<[u8; 16]>()
.iter()
.fold(String::new(), |mut output, b| {
let _ = write!(output, "{b:02X}");
@@ -233,7 +228,7 @@ pub(crate) fn make_data(
.map(|_| gen_sample_cnt(&mut rng))
.collect::<Vec<_>>();
for _ in 0..sample_cnt {
- let random_index = rng.gen_range(0..simultaneous_group_cnt);
+ let random_index = rng.random_range(0..simultaneous_group_cnt);
let trace_id = &mut group_ids[random_index];
let sample_cnt = &mut group_sample_cnts[random_index];
*sample_cnt -= 1;
diff --git a/datafusion/core/benches/map_query_sql.rs b/datafusion/core/benches/map_query_sql.rs
index 79229dfc2f..97d47fc3b9 100644
--- a/datafusion/core/benches/map_query_sql.rs
+++ b/datafusion/core/benches/map_query_sql.rs
@@ -34,7 +34,7 @@ mod data_utils;
fn build_keys(rng: &mut ThreadRng) -> Vec<String> {
let mut keys = vec![];
for _ in 0..1000 {
- keys.push(rng.gen_range(0..9999).to_string());
+ keys.push(rng.random_range(0..9999).to_string());
}
keys
}
@@ -42,7 +42,7 @@ fn build_keys(rng: &mut ThreadRng) -> Vec<String> {
fn build_values(rng: &mut ThreadRng) -> Vec<i32> {
let mut values = vec![];
for _ in 0..1000 {
- values.push(rng.gen_range(0..9999));
+ values.push(rng.random_range(0..9999));
}
values
}
@@ -64,7 +64,7 @@ fn criterion_benchmark(c: &mut Criterion) {
let rt = Runtime::new().unwrap();
let df = rt.block_on(ctx.lock().table("t")).unwrap();
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let keys = build_keys(&mut rng);
let values = build_values(&mut rng);
let mut key_buffer = Vec::new();
diff --git a/datafusion/core/benches/parquet_query_sql.rs b/datafusion/core/benches/parquet_query_sql.rs
index f82a126c56..14dcdf15f1 100644
--- a/datafusion/core/benches/parquet_query_sql.rs
+++ b/datafusion/core/benches/parquet_query_sql.rs
@@ -29,9 +29,10 @@ use datafusion_common::instant::Instant;
use futures::stream::StreamExt;
use parquet::arrow::ArrowWriter;
use parquet::file::properties::{WriterProperties, WriterVersion};
-use rand::distributions::uniform::SampleUniform;
-use rand::distributions::Alphanumeric;
+use rand::distr::uniform::SampleUniform;
+use rand::distr::Alphanumeric;
use rand::prelude::*;
+use rand::rng;
use std::fs::File;
use std::io::Read;
use std::ops::Range;
@@ -97,13 +98,13 @@ fn generate_string_dictionary(
len: usize,
valid_percent: f64,
) -> ArrayRef {
- let mut rng = thread_rng();
+ let mut rng = rng();
let strings: Vec<_> = (0..cardinality).map(|x| format!("{prefix}#{x}")).collect();
Arc::new(DictionaryArray::<Int32Type>::from_iter((0..len).map(
|_| {
- rng.gen_bool(valid_percent)
- .then(|| strings[rng.gen_range(0..cardinality)].as_str())
+ rng.random_bool(valid_percent)
+ .then(|| strings[rng.random_range(0..cardinality)].as_str())
},
)))
}
@@ -113,10 +114,10 @@ fn generate_strings(
len: usize,
valid_percent: f64,
) -> ArrayRef {
- let mut rng = thread_rng();
+ let mut rng = rng();
Arc::new(StringArray::from_iter((0..len).map(|_| {
- rng.gen_bool(valid_percent).then(|| {
- let string_len = rng.gen_range(string_length_range.clone());
+ rng.random_bool(valid_percent).then(|| {
+ let string_len = rng.random_range(string_length_range.clone());
(0..string_len)
.map(|_| char::from(rng.sample(Alphanumeric)))
.collect::<String>()
@@ -133,10 +134,10 @@ where
T: ArrowPrimitiveType,
T::Native: SampleUniform,
{
- let mut rng = thread_rng();
+ let mut rng = rng();
Arc::new(PrimitiveArray::<T>::from_iter((0..len).map(|_| {
- rng.gen_bool(valid_percent)
- .then(|| rng.gen_range(range.clone()))
+ rng.random_bool(valid_percent)
+ .then(|| rng.random_range(range.clone()))
})))
}
diff --git a/datafusion/core/benches/sort.rs b/datafusion/core/benches/sort.rs
index 85f456ce5d..e1bc478b36 100644
--- a/datafusion/core/benches/sort.rs
+++ b/datafusion/core/benches/sort.rs
@@ -595,7 +595,7 @@ impl DataGenerator {
/// Create an array of i64 sorted values (where approximately 1/3 values is repeated)
fn i64_values(&mut self) -> Vec<i64> {
let mut vec: Vec<_> = (0..INPUT_SIZE)
- .map(|_| self.rng.gen_range(0..INPUT_SIZE as i64))
+ .map(|_| self.rng.random_range(0..INPUT_SIZE as i64))
.collect();
vec.sort_unstable();
@@ -620,7 +620,7 @@ impl DataGenerator {
// pick from the 100 strings randomly
let mut input = (0..INPUT_SIZE)
.map(|_| {
- let idx = self.rng.gen_range(0..strings.len());
+ let idx = self.rng.random_range(0..strings.len());
let s = Arc::clone(&strings[idx]);
Some(s)
})
@@ -643,7 +643,7 @@ impl DataGenerator {
fn random_string(&mut self) -> String {
let rng = &mut self.rng;
- rng.sample_iter(rand::distributions::Alphanumeric)
+ rng.sample_iter(rand::distr::Alphanumeric)
.filter(|c| c.is_ascii_alphabetic())
.take(20)
.map(char::from)
@@ -665,7 +665,7 @@ where
let mut outputs: Vec<Vec<Vec<T>>> = (0..NUM_STREAMS).map(|_| Vec::new()).collect();
for i in input {
- let stream_idx = rng.gen_range(0..NUM_STREAMS);
+ let stream_idx = rng.random_range(0..NUM_STREAMS);
let stream = &mut outputs[stream_idx];
match stream.last_mut() {
Some(x) if x.len() < BATCH_SIZE => x.push(i),
diff --git a/datafusion/core/benches/sql_query_with_io.rs b/datafusion/core/benches/sql_query_with_io.rs
index 58d71ee5b2..58797dfed6 100644
--- a/datafusion/core/benches/sql_query_with_io.rs
+++ b/datafusion/core/benches/sql_query_with_io.rs
@@ -66,7 +66,7 @@ fn create_parquet_file(rng: &mut StdRng, id_offset: usize) -> Bytes {
let mut payload_builder = Int64Builder::new();
for row in 0..FILE_ROWS {
id_builder.append_value((row + id_offset) as u64);
- payload_builder.append_value(rng.gen());
+ payload_builder.append_value(rng.random());
}
let batch = RecordBatch::try_new(
Arc::clone(&schema),
diff --git a/datafusion/core/tests/dataframe/mod.rs b/datafusion/core/tests/dataframe/mod.rs
index d0692d6231..2a1d642687 100644
--- a/datafusion/core/tests/dataframe/mod.rs
+++ b/datafusion/core/tests/dataframe/mod.rs
@@ -3620,16 +3620,15 @@ async fn unnest_columns() -> Result<()> {
assert_snapshot!(
batches_to_sort_string(&results),
@r###"
- +----------+------------------------------------------------+--------------------+
- | shape_id | points | tags |
- +----------+------------------------------------------------+--------------------+
- | 1 | [{x: -3, y: -4}, {x: -3, y: 6}, {x: 2, y: -2}] | [tag1] |
- | 2 | | [tag1, tag2] |
- | 3 | [{x: -9, y: 2}, {x: -10, y: -4}] | |
- | 4 | [{x: -3, y: 5}, {x: 2, y: -1}] | [tag1, tag2, tag3] |
- +----------+------------------------------------------------+--------------------+
- "###
- );
+ +----------+---------------------------------+--------------------------+
+ | shape_id | points | tags |
+ +----------+---------------------------------+--------------------------+
+ | 1 | [{x: 5, y: -8}, {x: -3, y: -4}] | [tag1] |
+ | 2 | [{x: 6, y: 2}, {x: -2, y: -8}] | [tag1] |
+ | 3 | [{x: -9, y: -7}, {x: -2, y: 5}] | [tag1, tag2, tag3, tag4] |
+ | 4 | | [tag1, tag2, tag3] |
+ +----------+---------------------------------+--------------------------+
+ "###);
// Unnest tags
let df = table_with_nested_types(NUM_ROWS).await?;
@@ -3637,19 +3636,20 @@ async fn unnest_columns() -> Result<()> {
assert_snapshot!(
batches_to_sort_string(&results),
@r###"
- +----------+------------------------------------------------+------+
- | shape_id | points | tags |
- +----------+------------------------------------------------+------+
- | 1 | [{x: -3, y: -4}, {x: -3, y: 6}, {x: 2, y: -2}] | tag1 |
- | 2 | | tag1 |
- | 2 | | tag2 |
- | 3 | [{x: -9, y: 2}, {x: -10, y: -4}] | |
- | 4 | [{x: -3, y: 5}, {x: 2, y: -1}] | tag1 |
- | 4 | [{x: -3, y: 5}, {x: 2, y: -1}] | tag2 |
- | 4 | [{x: -3, y: 5}, {x: 2, y: -1}] | tag3 |
- +----------+------------------------------------------------+------+
- "###
- );
+ +----------+---------------------------------+------+
+ | shape_id | points | tags |
+ +----------+---------------------------------+------+
+ | 1 | [{x: 5, y: -8}, {x: -3, y: -4}] | tag1 |
+ | 2 | [{x: 6, y: 2}, {x: -2, y: -8}] | tag1 |
+ | 3 | [{x: -9, y: -7}, {x: -2, y: 5}] | tag1 |
+ | 3 | [{x: -9, y: -7}, {x: -2, y: 5}] | tag2 |
+ | 3 | [{x: -9, y: -7}, {x: -2, y: 5}] | tag3 |
+ | 3 | [{x: -9, y: -7}, {x: -2, y: 5}] | tag4 |
+ | 4 | | tag1 |
+ | 4 | | tag2 |
+ | 4 | | tag3 |
+ +----------+---------------------------------+------+
+ "###);
// Test aggregate results for tags.
let df = table_with_nested_types(NUM_ROWS).await?;
@@ -3662,20 +3662,18 @@ async fn unnest_columns() -> Result<()> {
assert_snapshot!(
batches_to_sort_string(&results),
@r###"
- +----------+-----------------+--------------------+
- | shape_id | points | tags |
- +----------+-----------------+--------------------+
- | 1 | {x: -3, y: -4} | [tag1] |
- | 1 | {x: -3, y: 6} | [tag1] |
- | 1 | {x: 2, y: -2} | [tag1] |
- | 2 | | [tag1, tag2] |
- | 3 | {x: -10, y: -4} | |
- | 3 | {x: -9, y: 2} | |
- | 4 | {x: -3, y: 5} | [tag1, tag2, tag3] |
- | 4 | {x: 2, y: -1} | [tag1, tag2, tag3] |
- +----------+-----------------+--------------------+
- "###
- );
+ +----------+----------------+--------------------------+
+ | shape_id | points | tags |
+ +----------+----------------+--------------------------+
+ | 1 | {x: -3, y: -4} | [tag1] |
+ | 1 | {x: 5, y: -8} | [tag1] |
+ | 2 | {x: -2, y: -8} | [tag1] |
+ | 2 | {x: 6, y: 2} | [tag1] |
+ | 3 | {x: -2, y: 5} | [tag1, tag2, tag3, tag4] |
+ | 3 | {x: -9, y: -7} | [tag1, tag2, tag3, tag4] |
+ | 4 | | [tag1, tag2, tag3] |
+ +----------+----------------+--------------------------+
+ "###);
// Test aggregate results for points.
let df = table_with_nested_types(NUM_ROWS).await?;
@@ -3692,25 +3690,26 @@ async fn unnest_columns() -> Result<()> {
assert_snapshot!(
batches_to_sort_string(&results),
@r###"
- +----------+-----------------+------+
- | shape_id | points | tags |
- +----------+-----------------+------+
- | 1 | {x: -3, y: -4} | tag1 |
- | 1 | {x: -3, y: 6} | tag1 |
- | 1 | {x: 2, y: -2} | tag1 |
- | 2 | | tag1 |
- | 2 | | tag2 |
- | 3 | {x: -10, y: -4} | |
- | 3 | {x: -9, y: 2} | |
- | 4 | {x: -3, y: 5} | tag1 |
- | 4 | {x: -3, y: 5} | tag2 |
- | 4 | {x: -3, y: 5} | tag3 |
- | 4 | {x: 2, y: -1} | tag1 |
- | 4 | {x: 2, y: -1} | tag2 |
- | 4 | {x: 2, y: -1} | tag3 |
- +----------+-----------------+------+
- "###
- );
+ +----------+----------------+------+
+ | shape_id | points | tags |
+ +----------+----------------+------+
+ | 1 | {x: -3, y: -4} | tag1 |
+ | 1 | {x: 5, y: -8} | tag1 |
+ | 2 | {x: -2, y: -8} | tag1 |
+ | 2 | {x: 6, y: 2} | tag1 |
+ | 3 | {x: -2, y: 5} | tag1 |
+ | 3 | {x: -2, y: 5} | tag2 |
+ | 3 | {x: -2, y: 5} | tag3 |
+ | 3 | {x: -2, y: 5} | tag4 |
+ | 3 | {x: -9, y: -7} | tag1 |
+ | 3 | {x: -9, y: -7} | tag2 |
+ | 3 | {x: -9, y: -7} | tag3 |
+ | 3 | {x: -9, y: -7} | tag4 |
+ | 4 | | tag1 |
+ | 4 | | tag2 |
+ | 4 | | tag3 |
+ +----------+----------------+------+
+ "###);
// Test aggregate results for points and tags.
let df = table_with_nested_types(NUM_ROWS).await?;
@@ -4044,15 +4043,15 @@ async fn unnest_aggregate_columns() -> Result<()> {
assert_snapshot!(
batches_to_sort_string(&results),
@r###"
- +--------------------+
- | tags |
- +--------------------+
- | |
- | [tag1, tag2, tag3] |
- | [tag1, tag2, tag3] |
- | [tag1, tag2] |
- | [tag1] |
- +--------------------+
+ +--------------------------+
+ | tags |
+ +--------------------------+
+ | [tag1, tag2, tag3, tag4] |
+ | [tag1, tag2, tag3] |
+ | [tag1, tag2] |
+ | [tag1] |
+ | [tag1] |
+ +--------------------------+
"###
);
@@ -4068,7 +4067,7 @@ async fn unnest_aggregate_columns() -> Result<()> {
+-------------+
| count(tags) |
+-------------+
- | 9 |
+ | 11 |
+-------------+
"###
);
@@ -4317,7 +4316,7 @@ async fn unnest_analyze_metrics() -> Result<()> {
assert_contains!(&formatted, "elapsed_compute=");
assert_contains!(&formatted, "input_batches=1");
assert_contains!(&formatted, "input_rows=5");
- assert_contains!(&formatted, "output_rows=10");
+ assert_contains!(&formatted, "output_rows=11");
assert_contains!(&formatted, "output_batches=1");
Ok(())
@@ -4664,7 +4663,7 @@ async fn table_with_nested_types(n: usize) -> Result<DataFrame> {
shape_id_builder.append_value(idx as u32 + 1);
// Add a random number of points
- let num_points: usize = rng.gen_range(0..4);
+ let num_points: usize = rng.random_range(0..4);
if num_points > 0 {
for _ in 0..num_points.max(2) {
// Add x value
@@ -4672,13 +4671,13 @@ async fn table_with_nested_types(n: usize) -> Result<DataFrame> {
.values()
.field_builder::<Int32Builder>(0)
.unwrap()
- .append_value(rng.gen_range(-10..10));
+ .append_value(rng.random_range(-10..10));
// Add y value
points_builder
.values()
.field_builder::<Int32Builder>(1)
.unwrap()
- .append_value(rng.gen_range(-10..10));
+ .append_value(rng.random_range(-10..10));
points_builder.values().append(true);
}
}
@@ -4687,7 +4686,7 @@ async fn table_with_nested_types(n: usize) -> Result<DataFrame> {
points_builder.append(num_points > 0);
// Append tags.
- let num_tags: usize = rng.gen_range(0..5);
+ let num_tags: usize = rng.random_range(0..5);
for id in 0..num_tags {
tags_builder.values().append_value(format!("tag{}", id + 1));
}
diff --git a/datafusion/core/tests/fuzz_cases/aggregate_fuzz.rs b/datafusion/core/tests/fuzz_cases/aggregate_fuzz.rs
index 98373ce4eb..7e5ad011b5 100644
--- a/datafusion/core/tests/fuzz_cases/aggregate_fuzz.rs
+++ b/datafusion/core/tests/fuzz_cases/aggregate_fuzz.rs
@@ -55,7 +55,7 @@ use datafusion_execution::runtime_env::RuntimeEnvBuilder;
use datafusion_execution::TaskContext;
use datafusion_physical_plan::metrics::MetricValue;
use rand::rngs::StdRng;
-use rand::{random, thread_rng, Rng, SeedableRng};
+use rand::{random, rng, Rng, SeedableRng};
use super::record_batch_generator::get_supported_types_columns;
@@ -241,8 +241,8 @@ async fn test_median() {
/// 1. Floating point numbers
/// 1. structured types
fn baseline_config() -> DatasetGeneratorConfig {
- let mut rng = thread_rng();
- let columns = get_supported_types_columns(rng.gen());
+ let mut rng = rng();
+ let columns = get_supported_types_columns(rng.random());
let min_num_rows = 512;
let max_num_rows = 1024;
@@ -431,13 +431,13 @@ pub(crate) fn make_staggered_batches<const STREAM: bool>(
let mut input4: Vec<i64> = vec![0; len];
input123.iter_mut().for_each(|v| {
*v = (
- rng.gen_range(0..n_distinct) as i64,
- rng.gen_range(0..n_distinct) as i64,
- rng.gen_range(0..n_distinct) as i64,
+ rng.random_range(0..n_distinct) as i64,
+ rng.random_range(0..n_distinct) as i64,
+ rng.random_range(0..n_distinct) as i64,
)
});
input4.iter_mut().for_each(|v| {
- *v = rng.gen_range(0..n_distinct) as i64;
+ *v = rng.random_range(0..n_distinct) as i64;
});
input123.sort();
let input1 = Int64Array::from_iter_values(input123.clone().into_iter().map(|k| k.0));
@@ -457,7 +457,7 @@ pub(crate) fn make_staggered_batches<const STREAM: bool>(
let mut batches = vec![];
if STREAM {
while remainder.num_rows() > 0 {
- let batch_size = rng.gen_range(0..50);
+ let batch_size = rng.random_range(0..50);
if remainder.num_rows() < batch_size {
break;
}
@@ -466,7 +466,7 @@ pub(crate) fn make_staggered_batches<const STREAM: bool>(
}
} else {
while remainder.num_rows() > 0 {
- let batch_size = rng.gen_range(0..remainder.num_rows() + 1);
+ let batch_size = rng.random_range(0..remainder.num_rows() + 1);
batches.push(remainder.slice(0, batch_size));
remainder = remainder.slice(batch_size, remainder.num_rows() - batch_size);
}
@@ -692,8 +692,8 @@ async fn test_single_mode_aggregate_with_spill() -> Result<()> {
Arc::new(StringArray::from(
(0..1024)
.map(|_| -> String {
- thread_rng()
- .sample_iter::<char, _>(rand::distributions::Standard)
+ rng()
+ .sample_iter::<char, _>(rand::distr::StandardUniform)
.take(5)
.collect()
})
diff --git a/datafusion/core/tests/fuzz_cases/aggregation_fuzzer/context_generator.rs b/datafusion/core/tests/fuzz_cases/aggregation_fuzzer/context_generator.rs
index 3c9fe29172..2abfcd8417 100644
--- a/datafusion/core/tests/fuzz_cases/aggregation_fuzzer/context_generator.rs
+++ b/datafusion/core/tests/fuzz_cases/aggregation_fuzzer/context_generator.rs
@@ -25,7 +25,7 @@ use datafusion_catalog::TableProvider;
use datafusion_common::ScalarValue;
use datafusion_common::{error::Result, utils::get_available_parallelism};
use datafusion_expr::col;
-use rand::{thread_rng, Rng};
+use rand::{rng, Rng};
use crate::fuzz_cases::aggregation_fuzzer::data_generator::Dataset;
@@ -112,7 +112,7 @@ impl SessionContextGenerator {
/// Randomly generate session context
pub fn generate(&self) -> Result<SessionContextWithParams> {
- let mut rng = thread_rng();
+ let mut rng = rng();
let schema = self.dataset.batches[0].schema();
let batches = self.dataset.batches.clone();
let provider = MemTable::try_new(schema, vec![batches])?;
@@ -123,17 +123,17 @@ impl SessionContextGenerator {
// - `skip_partial`, trigger or not trigger currently for simplicity
// - `sorted`, if found a sorted dataset, will or will not push down this information
// - `spilling`(TODO)
- let batch_size = rng.gen_range(1..=self.max_batch_size);
+ let batch_size = rng.random_range(1..=self.max_batch_size);
- let target_partitions = rng.gen_range(1..=self.max_target_partitions);
+ let target_partitions = rng.random_range(1..=self.max_target_partitions);
let skip_partial_params_idx =
- rng.gen_range(0..self.candidate_skip_partial_params.len());
+ rng.random_range(0..self.candidate_skip_partial_params.len());
let skip_partial_params =
self.candidate_skip_partial_params[skip_partial_params_idx];
let (provider, sort_hint) =
- if rng.gen_bool(0.5) && !self.dataset.sort_keys.is_empty() {
+ if rng.random_bool(0.5) && !self.dataset.sort_keys.is_empty() {
// Sort keys exist and random to push down
let sort_exprs = self
.dataset
diff --git a/datafusion/core/tests/fuzz_cases/aggregation_fuzzer/fuzzer.rs b/datafusion/core/tests/fuzz_cases/aggregation_fuzzer/fuzzer.rs
index f3708ff85e..cfb3c1c6a1 100644
--- a/datafusion/core/tests/fuzz_cases/aggregation_fuzzer/fuzzer.rs
+++ b/datafusion/core/tests/fuzz_cases/aggregation_fuzzer/fuzzer.rs
@@ -21,7 +21,7 @@ use arrow::array::RecordBatch;
use arrow::util::pretty::pretty_format_batches;
use datafusion_common::{DataFusionError, Result};
use datafusion_common_runtime::JoinSet;
-use rand::{thread_rng, Rng};
+use rand::{rng, Rng};
use crate::fuzz_cases::aggregation_fuzzer::query_builder::QueryBuilder;
use crate::fuzz_cases::aggregation_fuzzer::{
@@ -163,7 +163,7 @@ impl AggregationFuzzer {
async fn run_inner(&mut self) -> Result<()> {
let mut join_set = JoinSet::new();
- let mut rng = thread_rng();
+ let mut rng = rng();
// Loop to generate datasets and its query
for _ in 0..self.data_gen_rounds {
@@ -177,7 +177,7 @@ impl AggregationFuzzer {
let query_groups = datasets
.into_iter()
.map(|dataset| {
- let sql_idx = rng.gen_range(0..self.candidate_sqls.len());
+ let sql_idx = rng.random_range(0..self.candidate_sqls.len());
let sql = self.candidate_sqls[sql_idx].clone();
QueryGroup { dataset, sql }
diff --git a/datafusion/core/tests/fuzz_cases/aggregation_fuzzer/query_builder.rs b/datafusion/core/tests/fuzz_cases/aggregation_fuzzer/query_builder.rs
index 274bc761ac..209278385b 100644
--- a/datafusion/core/tests/fuzz_cases/aggregation_fuzzer/query_builder.rs
+++ b/datafusion/core/tests/fuzz_cases/aggregation_fuzzer/query_builder.rs
@@ -17,7 +17,7 @@
use std::{collections::HashSet, str::FromStr};
-use rand::{seq::SliceRandom, thread_rng, Rng};
+use rand::{rng, seq::SliceRandom, Rng};
/// Random aggregate query builder
///
@@ -277,8 +277,8 @@ impl QueryBuilder {
/// * `alias` is a unique alias `colN` for the column (to avoid duplicate column names)
fn random_aggregate_functions(&self, group_by_cols: &[String]) -> Vec<String> {
const MAX_NUM_FUNCTIONS: usize = 5;
- let mut rng = thread_rng();
- let num_aggregate_functions = rng.gen_range(1..=MAX_NUM_FUNCTIONS);
+ let mut rng = rng();
+ let num_aggregate_functions = rng.random_range(1..=MAX_NUM_FUNCTIONS);
let mut alias_gen = 1;
@@ -292,7 +292,7 @@ impl QueryBuilder {
}
while aggregate_functions.len() < num_aggregate_functions {
- let idx = rng.gen_range(0..self.aggregate_functions.len());
+ let idx = rng.random_range(0..self.aggregate_functions.len());
let (function_name, is_distinct) = &self.aggregate_functions[idx];
let argument = self.random_argument();
let alias = format!("col{alias_gen}");
@@ -320,8 +320,8 @@ impl QueryBuilder {
/// Pick a random aggregate function argument
fn random_argument(&self) -> String {
- let mut rng = thread_rng();
- let idx = rng.gen_range(0..self.arguments.len());
+ let mut rng = rng();
+ let idx = rng.random_range(0..self.arguments.len());
self.arguments[idx].clone()
}
@@ -333,17 +333,17 @@ impl QueryBuilder {
.cloned()
.collect();
- available_columns.shuffle(&mut thread_rng());
+ available_columns.shuffle(&mut rng());
let num_of_order_by_col = 12;
let column_count = std::cmp::min(num_of_order_by_col, available_columns.len());
let selected_columns = &available_columns[0..column_count];
- let mut rng = thread_rng();
+ let mut rng = rng();
let mut result = String::from_str(" order by ").unwrap();
for col in selected_columns {
- let order = if rng.gen_bool(0.5) { "ASC" } else { "DESC" };
+ let order = if rng.random_bool(0.5) { "ASC" } else { "DESC" };
result.push_str(&format!("{col} {order},"));
}
@@ -351,7 +351,7 @@ impl QueryBuilder {
}
fn null_opt(&self) -> String {
- if thread_rng().gen_bool(0.5) {
+ if rng().random_bool(0.5) {
"RESPECT NULLS".to_string()
} else {
"IGNORE NULLS".to_string()
@@ -363,18 +363,18 @@ impl QueryBuilder {
/// Limited to `max_group_by_columns` group by columns to ensure coverage for large groups.
/// With larger numbers of columns, each group has many fewer values.
fn random_group_by(&self) -> Vec<String> {
- let mut rng = thread_rng();
+ let mut rng = rng();
let min_groups = self.min_group_by_columns;
let max_groups = self.max_group_by_columns;
assert!(min_groups <= max_groups);
- let num_group_by = rng.gen_range(min_groups..=max_groups);
+ let num_group_by = rng.random_range(min_groups..=max_groups);
let mut already_used = HashSet::new();
let mut group_by = vec![];
while group_by.len() < num_group_by
&& already_used.len() != self.group_by_columns.len()
{
- let idx = rng.gen_range(0..self.group_by_columns.len());
+ let idx = rng.random_range(0..self.group_by_columns.len());
if already_used.insert(idx) {
group_by.push(self.group_by_columns[idx].clone());
}
diff --git a/datafusion/core/tests/fuzz_cases/equivalence/utils.rs b/datafusion/core/tests/fuzz_cases/equivalence/utils.rs
index d4b41b6866..a906648f87 100644
--- a/datafusion/core/tests/fuzz_cases/equivalence/utils.rs
+++ b/datafusion/core/tests/fuzz_cases/equivalence/utils.rs
@@ -114,7 +114,7 @@ pub fn create_random_schema(seed: u64) -> Result<(SchemaRef, EquivalenceProperti
};
while !remaining_exprs.is_empty() {
- let n_sort_expr = rng.gen_range(0..remaining_exprs.len() + 1);
+ let n_sort_expr = rng.random_range(0..remaining_exprs.len() + 1);
remaining_exprs.shuffle(&mut rng);
let ordering = remaining_exprs
@@ -369,7 +369,7 @@ pub fn generate_table_for_eq_properties(
// Utility closure to generate random array
let mut generate_random_array = |num_elems: usize, max_val: usize| -> ArrayRef {
let values: Vec<f64> = (0..num_elems)
- .map(|_| rng.gen_range(0..max_val) as f64 / 2.0)
+ .map(|_| rng.random_range(0..max_val) as f64 / 2.0)
.collect();
Arc::new(Float64Array::from_iter_values(values))
};
@@ -524,7 +524,7 @@ fn generate_random_f64_array(
rng: &mut StdRng,
) -> ArrayRef {
let values: Vec<f64> = (0..n_elems)
- .map(|_| rng.gen_range(0..n_distinct) as f64 / 2.0)
+ .map(|_| rng.random_range(0..n_distinct) as f64 / 2.0)
.collect();
Arc::new(Float64Array::from_iter_values(values))
}
diff --git a/datafusion/core/tests/fuzz_cases/join_fuzz.rs b/datafusion/core/tests/fuzz_cases/join_fuzz.rs
index fc2e1069d7..82ee73b525 100644
--- a/datafusion/core/tests/fuzz_cases/join_fuzz.rs
+++ b/datafusion/core/tests/fuzz_cases/join_fuzz.rs
@@ -761,13 +761,13 @@ impl JoinFuzzTestCase {
/// two sorted int32 columns 'a', 'b' ranged from 0..99 as join columns
/// two random int32 columns 'x', 'y' as other columns
fn make_staggered_batches(len: usize) -> Vec<RecordBatch> {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let mut input12: Vec<(i32, i32)> = vec![(0, 0); len];
let mut input3: Vec<i32> = vec![0; len];
let mut input4: Vec<i32> = vec![0; len];
input12
.iter_mut()
- .for_each(|v| *v = (rng.gen_range(0..100), rng.gen_range(0..100)));
+ .for_each(|v| *v = (rng.random_range(0..100), rng.random_range(0..100)));
rng.fill(&mut input3[..]);
rng.fill(&mut input4[..]);
input12.sort_unstable();
diff --git a/datafusion/core/tests/fuzz_cases/limit_fuzz.rs b/datafusion/core/tests/fuzz_cases/limit_fuzz.rs
index 987a732eb2..4c5ebf0402 100644
--- a/datafusion/core/tests/fuzz_cases/limit_fuzz.rs
+++ b/datafusion/core/tests/fuzz_cases/limit_fuzz.rs
@@ -24,7 +24,7 @@ use arrow::util::pretty::pretty_format_batches;
use datafusion::datasource::MemTable;
use datafusion::prelude::SessionContext;
use datafusion_common::assert_contains;
-use rand::{thread_rng, Rng};
+use rand::{rng, Rng};
use std::sync::Arc;
use test_utils::stagger_batch;
@@ -54,11 +54,11 @@ async fn run_limit_fuzz_test<F>(make_data: F)
where
F: Fn(usize) -> SortedData,
{
- let mut rng = thread_rng();
+ let mut rng = rng();
for size in [10, 1_0000, 10_000, 100_000] {
let data = make_data(size);
// test various limits including some random ones
- for limit in [1, 3, 7, 17, 10000, rng.gen_range(1..size * 2)] {
+ for limit in [1, 3, 7, 17, 10000, rng.random_range(1..size * 2)] {
// limit can be larger than the number of rows in the input
run_limit_test(limit, &data).await;
}
@@ -97,13 +97,13 @@ impl SortedData {
/// Create an i32 column of random values, with the specified number of
/// rows, sorted the default
fn new_i32(size: usize) -> Self {
- let mut rng = thread_rng();
+ let mut rng = rng();
// have some repeats (approximately 1/3 of the values are the same)
let max = size as i32 / 3;
let data: Vec<Option<i32>> = (0..size)
.map(|_| {
// no nulls for now
- Some(rng.gen_range(0..max))
+ Some(rng.random_range(0..max))
})
.collect();
@@ -118,17 +118,17 @@ impl SortedData {
/// Create an f64 column of random values, with the specified number of
/// rows, sorted the default
fn new_f64(size: usize) -> Self {
- let mut rng = thread_rng();
+ let mut rng = rng();
let mut data: Vec<Option<f64>> = (0..size / 3)
.map(|_| {
// no nulls for now
- Some(rng.gen_range(0.0..1.0f64))
+ Some(rng.random_range(0.0..1.0f64))
})
.collect();
// have some repeats (approximately 1/3 of the values are the same)
while data.len() < size {
- data.push(data[rng.gen_range(0..data.len())]);
+ data.push(data[rng.random_range(0..data.len())]);
}
let batches = stagger_batch(f64_batch(data.iter().cloned()));
@@ -142,7 +142,7 @@ impl SortedData {
/// Create an string column of random values, with the specified number of
/// rows, sorted the default
fn new_str(size: usize) -> Self {
- let mut rng = thread_rng();
+ let mut rng = rng();
let mut data: Vec<Option<String>> = (0..size / 3)
.map(|_| {
// no nulls for now
@@ -152,7 +152,7 @@ impl SortedData {
// have some repeats (approximately 1/3 of the values are the same)
while data.len() < size {
- data.push(data[rng.gen_range(0..data.len())].clone());
+ data.push(data[rng.random_range(0..data.len())].clone());
}
let batches = stagger_batch(string_batch(data.iter()));
@@ -166,7 +166,7 @@ impl SortedData {
/// Create two columns of random values (int64, string), with the specified number of
/// rows, sorted the default
fn new_i64str(size: usize) -> Self {
- let mut rng = thread_rng();
+ let mut rng = rng();
// 100 distinct values
let strings: Vec<Option<String>> = (0..100)
@@ -180,8 +180,8 @@ impl SortedData {
let data = (0..size)
.map(|_| {
(
- Some(rng.gen_range(0..10)),
- strings[rng.gen_range(0..strings.len())].clone(),
+ Some(rng.random_range(0..10)),
+ strings[rng.random_range(0..strings.len())].clone(),
)
})
.collect::<Vec<_>>();
@@ -340,8 +340,8 @@ async fn run_limit_test(fetch: usize, data: &SortedData) {
/// Return random ASCII String with len
fn get_random_string(len: usize) -> String {
- thread_rng()
- .sample_iter(rand::distributions::Alphanumeric)
+ rng()
+ .sample_iter(rand::distr::Alphanumeric)
.take(len)
.map(char::from)
.collect()
diff --git a/datafusion/core/tests/fuzz_cases/pruning.rs b/datafusion/core/tests/fuzz_cases/pruning.rs
index b7cf606870..6e624d458b 100644
--- a/datafusion/core/tests/fuzz_cases/pruning.rs
+++ b/datafusion/core/tests/fuzz_cases/pruning.rs
@@ -226,7 +226,7 @@ impl Utf8Test {
return (*files).clone();
}
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let values = Self::values();
let mut row_groups = vec![];
@@ -345,7 +345,7 @@ async fn write_parquet_file(
/// The string values for [Utf8Test::values]
static VALUES: LazyLock<Vec<String>> = LazyLock::new(|| {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let characters = [
"z",
diff --git a/datafusion/core/tests/fuzz_cases/record_batch_generator.rs b/datafusion/core/tests/fuzz_cases/record_batch_generator.rs
index d2ee4e891c..7b48eadf77 100644
--- a/datafusion/core/tests/fuzz_cases/record_batch_generator.rs
+++ b/datafusion/core/tests/fuzz_cases/record_batch_generator.rs
@@ -33,7 +33,7 @@ use arrow_schema::{
DECIMAL256_MAX_SCALE,
};
use datafusion_common::{arrow_datafusion_err, DataFusionError, Result};
-use rand::{rngs::StdRng, thread_rng, Rng, SeedableRng};
+use rand::{rng, rngs::StdRng, Rng, SeedableRng};
use test_utils::array_gen::{
BinaryArrayGenerator, BooleanArrayGenerator, DecimalArrayGenerator,
PrimitiveArrayGenerator, StringArrayGenerator,
@@ -104,15 +104,15 @@ pub fn get_supported_types_columns(rng_seed: u64) -> Vec<ColumnDescr> {
DataType::Duration(TimeUnit::Nanosecond),
),
ColumnDescr::new("decimal128", {
- let precision: u8 = rng.gen_range(1..=DECIMAL128_MAX_PRECISION);
- let scale: i8 = rng.gen_range(
+ let precision: u8 = rng.random_range(1..=DECIMAL128_MAX_PRECISION);
+ let scale: i8 = rng.random_range(
i8::MIN..=std::cmp::min(precision as i8, DECIMAL128_MAX_SCALE),
);
DataType::Decimal128(precision, scale)
}),
ColumnDescr::new("decimal256", {
- let precision: u8 = rng.gen_range(1..=DECIMAL256_MAX_PRECISION);
- let scale: i8 = rng.gen_range(
+ let precision: u8 = rng.random_range(1..=DECIMAL256_MAX_PRECISION);
+ let scale: i8 = rng.random_range(
i8::MIN..=std::cmp::min(precision as i8, DECIMAL256_MAX_SCALE),
);
DataType::Decimal256(precision, scale)
@@ -179,14 +179,15 @@ pub struct RecordBatchGenerator {
/// If a seed is provided when constructing the generator, it will be used to
/// create `rng` and the pseudo-randomly generated batches will be deterministic.
- /// Otherwise, `rng` will be initialized using `thread_rng()` and the batches
+ /// Otherwise, `rng` will be initialized using `rng()` and the batches
/// generated will be different each time.
rng: StdRng,
}
macro_rules! generate_decimal_array {
($SELF:ident, $NUM_ROWS:ident, $MAX_NUM_DISTINCT: expr, $BATCH_GEN_RNG:ident, $ARRAY_GEN_RNG:ident, $PRECISION: ident, $SCALE: ident, $ARROW_TYPE: ident) => {{
- let null_pct_idx = $BATCH_GEN_RNG.gen_range(0..$SELF.candidate_null_pcts.len());
+ let null_pct_idx =
+ $BATCH_GEN_RNG.random_range(0..$SELF.candidate_null_pcts.len());
let null_pct = $SELF.candidate_null_pcts[null_pct_idx];
let mut generator = DecimalArrayGenerator {
@@ -206,7 +207,8 @@ macro_rules! generate_decimal_array {
macro_rules! generate_boolean_array {
($SELF:ident, $NUM_ROWS:ident, $MAX_NUM_DISTINCT:expr, $BATCH_GEN_RNG:ident, $ARRAY_GEN_RNG:ident, $ARROW_TYPE: ident) => {{
// Select a null percentage from the candidate percentages
- let null_pct_idx = $BATCH_GEN_RNG.gen_range(0..$SELF.candidate_null_pcts.len());
+ let null_pct_idx =
+ $BATCH_GEN_RNG.random_range(0..$SELF.candidate_null_pcts.len());
let null_pct = $SELF.candidate_null_pcts[null_pct_idx];
let num_distinct_booleans = if $MAX_NUM_DISTINCT >= 2 { 2 } else { 1 };
@@ -224,7 +226,8 @@ macro_rules! generate_boolean_array {
macro_rules! generate_primitive_array {
($SELF:ident, $NUM_ROWS:ident, $MAX_NUM_DISTINCT:expr, $BATCH_GEN_RNG:ident, $ARRAY_GEN_RNG:ident, $ARROW_TYPE:ident) => {{
- let null_pct_idx = $BATCH_GEN_RNG.gen_range(0..$SELF.candidate_null_pcts.len());
+ let null_pct_idx =
+ $BATCH_GEN_RNG.random_range(0..$SELF.candidate_null_pcts.len());
let null_pct = $SELF.candidate_null_pcts[null_pct_idx];
let mut generator = PrimitiveArrayGenerator {
@@ -253,7 +256,7 @@ impl RecordBatchGenerator {
max_rows_num,
columns,
candidate_null_pcts,
- rng: StdRng::from_rng(thread_rng()).unwrap(),
+ rng: StdRng::from_rng(&mut rng()),
}
}
@@ -265,9 +268,9 @@ impl RecordBatchGenerator {
}
pub fn generate(&mut self) -> Result<RecordBatch> {
- let num_rows = self.rng.gen_range(self.min_rows_num..=self.max_rows_num);
- let array_gen_rng = StdRng::from_seed(self.rng.gen());
- let mut batch_gen_rng = StdRng::from_seed(self.rng.gen());
+ let num_rows = self.rng.random_range(self.min_rows_num..=self.max_rows_num);
+ let array_gen_rng = StdRng::from_seed(self.rng.random());
+ let mut batch_gen_rng = StdRng::from_seed(self.rng.random());
let columns = self.columns.clone();
// Build arrays
@@ -301,7 +304,7 @@ impl RecordBatchGenerator {
array_gen_rng: StdRng,
) -> ArrayRef {
let num_distinct = if num_rows > 1 {
- batch_gen_rng.gen_range(1..num_rows)
+ batch_gen_rng.random_range(1..num_rows)
} else {
num_rows
};
@@ -584,9 +587,9 @@ impl RecordBatchGenerator {
}
DataType::Utf8 | DataType::LargeUtf8 | DataType::Utf8View => {
let null_pct_idx =
- batch_gen_rng.gen_range(0..self.candidate_null_pcts.len());
+ batch_gen_rng.random_range(0..self.candidate_null_pcts.len());
let null_pct = self.candidate_null_pcts[null_pct_idx];
- let max_len = batch_gen_rng.gen_range(1..50);
+ let max_len = batch_gen_rng.random_range(1..50);
let mut generator = StringArrayGenerator {
max_len,
@@ -605,9 +608,9 @@ impl RecordBatchGenerator {
}
DataType::Binary | DataType::LargeBinary | DataType::BinaryView => {
let null_pct_idx =
- batch_gen_rng.gen_range(0..self.candidate_null_pcts.len());
+ batch_gen_rng.random_range(0..self.candidate_null_pcts.len());
let null_pct = self.candidate_null_pcts[null_pct_idx];
- let max_len = batch_gen_rng.gen_range(1..100);
+ let max_len = batch_gen_rng.random_range(1..100);
let mut generator = BinaryArrayGenerator {
max_len,
diff --git a/datafusion/core/tests/fuzz_cases/sort_fuzz.rs b/datafusion/core/tests/fuzz_cases/sort_fuzz.rs
index e47a983779..703b871582 100644
--- a/datafusion/core/tests/fuzz_cases/sort_fuzz.rs
+++ b/datafusion/core/tests/fuzz_cases/sort_fuzz.rs
@@ -298,20 +298,20 @@ impl SortTest {
/// Return randomly sized record batches in a field named 'x' of type `Int32`
/// with randomized i32 content
fn make_staggered_i32_batches(len: usize) -> Vec<RecordBatch> {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let max_batch = 1024;
let mut batches = vec![];
let mut remaining = len;
while remaining != 0 {
- let to_read = rng.gen_range(0..=remaining.min(max_batch));
+ let to_read = rng.random_range(0..=remaining.min(max_batch));
remaining -= to_read;
batches.push(
RecordBatch::try_from_iter(vec![(
"x",
Arc::new(Int32Array::from_iter_values(
- (0..to_read).map(|_| rng.gen()),
+ (0..to_read).map(|_| rng.random()),
)) as ArrayRef,
)])
.unwrap(),
@@ -323,20 +323,20 @@ fn make_staggered_i32_batches(len: usize) -> Vec<RecordBatch> {
/// Return randomly sized record batches in a field named 'x' of type `Utf8`
/// with randomized content
fn make_staggered_utf8_batches(len: usize) -> Vec<RecordBatch> {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let max_batch = 1024;
let mut batches = vec![];
let mut remaining = len;
while remaining != 0 {
- let to_read = rng.gen_range(0..=remaining.min(max_batch));
+ let to_read = rng.random_range(0..=remaining.min(max_batch));
remaining -= to_read;
batches.push(
RecordBatch::try_from_iter(vec![(
"x",
Arc::new(StringArray::from_iter_values(
- (0..to_read).map(|_| format!("test_string_{}", rng.gen::<u32>())),
+ (0..to_read).map(|_| format!("test_string_{}", rng.random::<u32>())),
)) as ArrayRef,
)])
.unwrap(),
@@ -349,13 +349,13 @@ fn make_staggered_utf8_batches(len: usize) -> Vec<RecordBatch> {
/// with randomized i32 content and a field named 'y' of type `Utf8`
/// with randomized content
fn make_staggered_i32_utf8_batches(len: usize) -> Vec<RecordBatch> {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let max_batch = 1024;
let mut batches = vec![];
let mut remaining = len;
while remaining != 0 {
- let to_read = rng.gen_range(0..=remaining.min(max_batch));
+ let to_read = rng.random_range(0..=remaining.min(max_batch));
remaining -= to_read;
batches.push(
@@ -363,13 +363,14 @@ fn make_staggered_i32_utf8_batches(len: usize) -> Vec<RecordBatch> {
(
"x",
Arc::new(Int32Array::from_iter_values(
- (0..to_read).map(|_| rng.gen()),
+ (0..to_read).map(|_| rng.random()),
)) as ArrayRef,
),
(
"y",
Arc::new(StringArray::from_iter_values(
- (0..to_read).map(|_| format!("test_string_{}", rng.gen::<u32>())),
+ (0..to_read)
+ .map(|_| format!("test_string_{}", rng.random::<u32>())),
)) as ArrayRef,
),
])
diff --git a/datafusion/core/tests/fuzz_cases/sort_preserving_repartition_fuzz.rs b/datafusion/core/tests/fuzz_cases/sort_preserving_repartition_fuzz.rs
index 76dc2b8051..cf6867758e 100644
--- a/datafusion/core/tests/fuzz_cases/sort_preserving_repartition_fuzz.rs
+++ b/datafusion/core/tests/fuzz_cases/sort_preserving_repartition_fuzz.rs
@@ -94,7 +94,7 @@ mod sp_repartition_fuzz_tests {
};
while !remaining_exprs.is_empty() {
- let n_sort_expr = rng.gen_range(0..remaining_exprs.len() + 1);
+ let n_sort_expr = rng.random_range(0..remaining_exprs.len() + 1);
remaining_exprs.shuffle(&mut rng);
let ordering = remaining_exprs
@@ -144,7 +144,7 @@ mod sp_repartition_fuzz_tests {
// Utility closure to generate random array
let mut generate_random_array = |num_elems: usize, max_val: usize| -> ArrayRef {
let values: Vec<u64> = (0..num_elems)
- .map(|_| rng.gen_range(0..max_val) as u64)
+ .map(|_| rng.random_range(0..max_val) as u64)
.collect();
Arc::new(UInt64Array::from_iter_values(values))
};
@@ -447,9 +447,9 @@ mod sp_repartition_fuzz_tests {
let mut input123: Vec<(i64, i64, i64)> = vec![(0, 0, 0); len];
input123.iter_mut().for_each(|v| {
*v = (
- rng.gen_range(0..n_distinct) as i64,
- rng.gen_range(0..n_distinct) as i64,
- rng.gen_range(0..n_distinct) as i64,
+ rng.random_range(0..n_distinct) as i64,
+ rng.random_range(0..n_distinct) as i64,
+ rng.random_range(0..n_distinct) as i64,
)
});
input123.sort();
@@ -471,7 +471,7 @@ mod sp_repartition_fuzz_tests {
let mut batches = vec![];
if STREAM {
while remainder.num_rows() > 0 {
- let batch_size = rng.gen_range(0..50);
+ let batch_size = rng.random_range(0..50);
if remainder.num_rows() < batch_size {
break;
}
@@ -481,7 +481,7 @@ mod sp_repartition_fuzz_tests {
}
} else {
while remainder.num_rows() > 0 {
- let batch_size = rng.gen_range(0..remainder.num_rows() + 1);
+ let batch_size = rng.random_range(0..remainder.num_rows() + 1);
batches.push(remainder.slice(0, batch_size));
remainder =
remainder.slice(batch_size, remainder.num_rows() - batch_size);
diff --git a/datafusion/core/tests/fuzz_cases/sort_query_fuzz.rs b/datafusion/core/tests/fuzz_cases/sort_query_fuzz.rs
index 0a305b8d5c..464d65acc2 100644
--- a/datafusion/core/tests/fuzz_cases/sort_query_fuzz.rs
+++ b/datafusion/core/tests/fuzz_cases/sort_query_fuzz.rs
@@ -30,13 +30,13 @@ use datafusion_execution::memory_pool::{
};
use datafusion_expr::display_schema;
use datafusion_physical_plan::spill::get_record_batch_memory_size;
-use rand::seq::SliceRandom;
use std::time::Duration;
use datafusion_execution::{
disk_manager::DiskManagerConfig, memory_pool::FairSpillPool,
runtime_env::RuntimeEnvBuilder,
};
+use rand::prelude::IndexedRandom;
use rand::Rng;
use rand::{rngs::StdRng, SeedableRng};
@@ -199,16 +199,16 @@ impl SortQueryFuzzer {
// Execute until either`max_rounds` or `time_limit` is reached
let max_rounds = self.max_rounds.unwrap_or(usize::MAX);
for round in 0..max_rounds {
- let init_seed = self.runner_rng.gen();
+ let init_seed = self.runner_rng.random();
for query_i in 0..self.queries_per_round {
- let query_seed = self.runner_rng.gen();
+ let query_seed = self.runner_rng.random();
let mut expected_results: Option<Vec<RecordBatch>> = None; // use first config's result as the expected result
for config_i in 0..self.config_variations_per_query {
if self.should_stop_due_to_time_limit(start_time, round, query_i) {
return Ok(());
}
- let config_seed = self.runner_rng.gen();
+ let config_seed = self.runner_rng.random();
println!(
"[SortQueryFuzzer] Round {round}, Query {query_i} (Config {config_i})"
@@ -299,7 +299,7 @@ impl SortFuzzerTestGenerator {
let mut rng = StdRng::seed_from_u64(rng_seed);
let min_ncol = min(candidate_columns.len(), 5);
let max_ncol = min(candidate_columns.len(), 10);
- let amount = rng.gen_range(min_ncol..=max_ncol);
+ let amount = rng.random_range(min_ncol..=max_ncol);
let selected_columns = candidate_columns
.choose_multiple(&mut rng, amount)
.cloned()
@@ -326,7 +326,7 @@ impl SortFuzzerTestGenerator {
/// memory table should be generated with more partitions, due to https://github.com/apache/datafusion/issues/15088
fn init_partitioned_staggered_batches(&mut self, rng_seed: u64) {
let mut rng = StdRng::seed_from_u64(rng_seed);
- let num_partitions = rng.gen_range(1..=self.max_partitions);
+ let num_partitions = rng.random_range(1..=self.max_partitions);
let max_batch_size = self.num_rows / num_partitions / 50;
let target_partition_size = self.num_rows / num_partitions;
@@ -343,7 +343,7 @@ impl SortFuzzerTestGenerator {
// Generate a random batch of size between 1 and max_batch_size
// Let edge case (1-row batch) more common
- let (min_nrow, max_nrow) = if rng.gen_bool(0.1) {
+ let (min_nrow, max_nrow) = if rng.random_bool(0.1) {
(1, 3)
} else {
(1, max_batch_size)
@@ -354,7 +354,7 @@ impl SortFuzzerTestGenerator {
max_nrow,
self.selected_columns.clone(),
)
- .with_seed(rng.gen());
+ .with_seed(rng.random());
let record_batch = record_batch_generator.generate().unwrap();
num_rows += record_batch.num_rows();
@@ -372,9 +372,9 @@ impl SortFuzzerTestGenerator {
}
// After all partitions are created, optionally make one partition have 0/1 batch
- if num_partitions > 2 && rng.gen_bool(0.1) {
- let partition_index = rng.gen_range(0..num_partitions);
- if rng.gen_bool(0.5) {
+ if num_partitions > 2 && rng.random_bool(0.1) {
+ let partition_index = rng.random_range(0..num_partitions);
+ if rng.random_bool(0.5) {
// 0 batch
partitions[partition_index] = Vec::new();
} else {
@@ -423,7 +423,7 @@ impl SortFuzzerTestGenerator {
pub fn generate_random_query(&self, rng_seed: u64) -> (String, Option<usize>) {
let mut rng = StdRng::seed_from_u64(rng_seed);
- let num_columns = rng.gen_range(1..=3).min(self.selected_columns.len());
+ let num_columns = rng.random_range(1..=3).min(self.selected_columns.len());
let selected_columns: Vec<_> = self
.selected_columns
.choose_multiple(&mut rng, num_columns)
@@ -432,12 +432,12 @@ impl SortFuzzerTestGenerator {
let mut order_by_clauses = Vec::new();
for col in selected_columns {
let mut clause = col.name.clone();
- if rng.gen_bool(0.5) {
- let order = if rng.gen_bool(0.5) { "ASC" } else { "DESC" };
+ if rng.random_bool(0.5) {
+ let order = if rng.random_bool(0.5) { "ASC" } else { "DESC" };
clause.push_str(&format!(" {order}"));
}
- if rng.gen_bool(0.5) {
- let nulls = if rng.gen_bool(0.5) {
+ if rng.random_bool(0.5) {
+ let nulls = if rng.random_bool(0.5) {
"NULLS FIRST"
} else {
"NULLS LAST"
@@ -449,14 +449,14 @@ impl SortFuzzerTestGenerator {
let dataset_size = self.dataset_state.as_ref().unwrap().dataset_size;
- let limit = if rng.gen_bool(0.2) {
+ let limit = if rng.random_bool(0.2) {
// Prefer edge cases for k like 1, dataset_size, etc.
- Some(if rng.gen_bool(0.5) {
+ Some(if rng.random_bool(0.5) {
let edge_cases =
[1, 2, 3, dataset_size - 1, dataset_size, dataset_size + 1];
*edge_cases.choose(&mut rng).unwrap()
} else {
- rng.gen_range(1..=dataset_size)
+ rng.random_range(1..=dataset_size)
})
} else {
None
@@ -486,12 +486,12 @@ impl SortFuzzerTestGenerator {
// 30% to 200% of the dataset size (if `with_memory_limit` is false, config
// will use the default unbounded pool to override it later)
- let memory_limit = rng.gen_range(
+ let memory_limit = rng.random_range(
(dataset_size as f64 * 0.5) as usize..=(dataset_size as f64 * 2.0) as usize,
);
// 10% to 20% of the per-partition memory limit size
let per_partition_mem_limit = memory_limit / num_partitions;
- let sort_spill_reservation_bytes = rng.gen_range(
+ let sort_spill_reservation_bytes = rng.random_range(
(per_partition_mem_limit as f64 * 0.2) as usize
..=(per_partition_mem_limit as f64 * 0.3) as usize,
);
@@ -504,7 +504,7 @@ impl SortFuzzerTestGenerator {
0
} else {
let dataset_size = self.dataset_state.as_ref().unwrap().dataset_size;
- rng.gen_range(0..=dataset_size * 2_usize)
+ rng.random_range(0..=dataset_size * 2_usize)
};
// Set up strings for printing
diff --git a/datafusion/core/tests/fuzz_cases/window_fuzz.rs b/datafusion/core/tests/fuzz_cases/window_fuzz.rs
index 3b665a3370..5bd2e457b4 100644
--- a/datafusion/core/tests/fuzz_cases/window_fuzz.rs
+++ b/datafusion/core/tests/fuzz_cases/window_fuzz.rs
@@ -51,7 +51,7 @@ use datafusion_physical_expr::expressions::{cast, col, lit};
use datafusion_physical_expr::{PhysicalExpr, PhysicalSortExpr};
use datafusion_physical_expr_common::sort_expr::LexOrdering;
-use rand::distributions::Alphanumeric;
+use rand::distr::Alphanumeric;
use rand::rngs::StdRng;
use rand::{Rng, SeedableRng};
use test_utils::add_empty_batches;
@@ -398,8 +398,8 @@ fn get_random_function(
WindowFunctionDefinition::WindowUDF(lead_udwf()),
vec![
arg.clone(),
- lit(ScalarValue::Int64(Some(rng.gen_range(1..10)))),
- lit(ScalarValue::Int64(Some(rng.gen_range(1..1000)))),
+ lit(ScalarValue::Int64(Some(rng.random_range(1..10)))),
+ lit(ScalarValue::Int64(Some(rng.random_range(1..1000)))),
],
),
);
@@ -409,8 +409,8 @@ fn get_random_function(
WindowFunctionDefinition::WindowUDF(lag_udwf()),
vec![
arg.clone(),
- lit(ScalarValue::Int64(Some(rng.gen_range(1..10)))),
- lit(ScalarValue::Int64(Some(rng.gen_range(1..1000)))),
+ lit(ScalarValue::Int64(Some(rng.random_range(1..10)))),
+ lit(ScalarValue::Int64(Some(rng.random_range(1..1000)))),
],
),
);
@@ -435,12 +435,12 @@ fn get_random_function(
WindowFunctionDefinition::WindowUDF(nth_value_udwf()),
vec![
arg.clone(),
- lit(ScalarValue::Int64(Some(rng.gen_range(1..10)))),
+ lit(ScalarValue::Int64(Some(rng.random_range(1..10)))),
],
),
);
- let rand_fn_idx = rng.gen_range(0..window_fn_map.len());
+ let rand_fn_idx = rng.random_range(0..window_fn_map.len());
let fn_name = window_fn_map.keys().collect::<Vec<_>>()[rand_fn_idx];
let (window_fn, args) = window_fn_map.values().collect::<Vec<_>>()[rand_fn_idx];
let mut args = args.clone();
@@ -463,12 +463,12 @@ fn get_random_window_frame(rng: &mut StdRng, is_linear: bool) -> WindowFrame {
is_preceding: bool,
}
let first_bound = Utils {
- val: rng.gen_range(0..10),
- is_preceding: rng.gen_range(0..2) == 0,
+ val: rng.random_range(0..10),
+ is_preceding: rng.random_range(0..2) == 0,
};
let second_bound = Utils {
- val: rng.gen_range(0..10),
- is_preceding: rng.gen_range(0..2) == 0,
+ val: rng.random_range(0..10),
+ is_preceding: rng.random_range(0..2) == 0,
};
let (start_bound, end_bound) =
if first_bound.is_preceding == second_bound.is_preceding {
@@ -485,7 +485,7 @@ fn get_random_window_frame(rng: &mut StdRng, is_linear: bool) -> WindowFrame {
(second_bound, first_bound)
};
// 0 means Range, 1 means Rows, 2 means GROUPS
- let rand_num = rng.gen_range(0..3);
+ let rand_num = rng.random_range(0..3);
let units = if rand_num < 1 {
WindowFrameUnits::Range
} else if rand_num < 2 {
@@ -517,7 +517,7 @@ fn get_random_window_frame(rng: &mut StdRng, is_linear: bool) -> WindowFrame {
};
let mut window_frame = WindowFrame::new_bounds(units, start_bound, end_bound);
// with 10% use unbounded preceding in tests
- if rng.gen_range(0..10) == 0 {
+ if rng.random_range(0..10) == 0 {
window_frame.start_bound =
WindowFrameBound::Preceding(ScalarValue::Int32(None));
}
@@ -545,7 +545,7 @@ fn get_random_window_frame(rng: &mut StdRng, is_linear: bool) -> WindowFrame {
};
let mut window_frame = WindowFrame::new_bounds(units, start_bound, end_bound);
// with 10% use unbounded preceding in tests
- if rng.gen_range(0..10) == 0 {
+ if rng.random_range(0..10) == 0 {
window_frame.start_bound =
WindowFrameBound::Preceding(ScalarValue::UInt64(None));
}
@@ -569,7 +569,7 @@ fn convert_bound_to_current_row_if_applicable(
match bound {
WindowFrameBound::Preceding(value) | WindowFrameBound::Following(value) => {
if let Ok(zero) = ScalarValue::new_zero(&value.data_type()) {
- if value == &zero && rng.gen_range(0..2) == 0 {
+ if value == &zero && rng.random_range(0..2) == 0 {
*bound = WindowFrameBound::CurrentRow;
}
}
@@ -758,9 +758,9 @@ pub(crate) fn make_staggered_batches<const STREAM: bool>(
let mut input5: Vec<String> = vec!["".to_string(); len];
input123.iter_mut().for_each(|v| {
*v = (
- rng.gen_range(0..n_distinct) as i32,
- rng.gen_range(0..n_distinct) as i32,
- rng.gen_range(0..n_distinct) as i32,
+ rng.random_range(0..n_distinct) as i32,
+ rng.random_range(0..n_distinct) as i32,
+ rng.random_range(0..n_distinct) as i32,
)
});
input123.sort();
@@ -788,7 +788,7 @@ pub(crate) fn make_staggered_batches<const STREAM: bool>(
let mut batches = vec![];
if STREAM {
while remainder.num_rows() > 0 {
- let batch_size = rng.gen_range(0..50);
+ let batch_size = rng.random_range(0..50);
if remainder.num_rows() < batch_size {
batches.push(remainder);
break;
@@ -798,7 +798,7 @@ pub(crate) fn make_staggered_batches<const STREAM: bool>(
}
} else {
while remainder.num_rows() > 0 {
- let batch_size = rng.gen_range(0..remainder.num_rows() + 1);
+ let batch_size = rng.random_range(0..remainder.num_rows() + 1);
batches.push(remainder.slice(0, batch_size));
remainder = remainder.slice(batch_size, remainder.num_rows() - batch_size);
}
diff --git a/datafusion/core/tests/memory_limit/mod.rs b/datafusion/core/tests/memory_limit/mod.rs
index 3d0dc0b60e..e4c650b510 100644
--- a/datafusion/core/tests/memory_limit/mod.rs
+++ b/datafusion/core/tests/memory_limit/mod.rs
@@ -417,7 +417,7 @@ async fn oom_with_tracked_consumer_pool() {
/// If there is memory explosion for spilled record batch, this test will fail.
#[tokio::test]
async fn test_stringview_external_sort() {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let array_length = 1000;
let num_batches = 200;
// Batches contain two columns: random 100-byte string, and random i32
@@ -427,7 +427,7 @@ async fn test_stringview_external_sort() {
let strings: Vec<String> = (0..array_length)
.map(|_| {
(0..100)
- .map(|_| rng.gen_range(0..=u8::MAX) as char)
+ .map(|_| rng.random_range(0..=u8::MAX) as char)
.collect()
})
.collect();
@@ -435,8 +435,9 @@ async fn test_stringview_external_sort() {
let string_array = StringViewArray::from(strings);
let array_ref: ArrayRef = Arc::new(string_array);
- let random_numbers: Vec<i32> =
- (0..array_length).map(|_| rng.gen_range(0..=1000)).collect();
+ let random_numbers: Vec<i32> = (0..array_length)
+ .map(|_| rng.random_range(0..=1000))
+ .collect();
let int_array = Int32Array::from(random_numbers);
let int_array_ref: ArrayRef = Arc::new(int_array);
diff --git a/datafusion/core/tests/parquet/filter_pushdown.rs b/datafusion/core/tests/parquet/filter_pushdown.rs
index 0fd7bfa5c9..b8d570916c 100644
--- a/datafusion/core/tests/parquet/filter_pushdown.rs
+++ b/datafusion/core/tests/parquet/filter_pushdown.rs
@@ -45,25 +45,29 @@ use tempfile::TempDir;
/// how many rows of generated data to write to our parquet file (arbitrary)
const NUM_ROWS: usize = 4096;
-#[tokio::test]
-async fn single_file() {
- // Only create the parquet file once as it is fairly large
- let tempdir = TempDir::new_in(Path::new(".")).unwrap();
- // Set row group size smaller so can test with fewer rows
- let props = WriterProperties::builder()
- .set_max_row_group_size(1024)
- .build();
+async fn read_parquet_test_data<T: Into<String>>(path: T) -> Vec<RecordBatch> {
let ctx: SessionContext = SessionContext::new();
- let batches = ctx
- .read_parquet(
- "tests/data/filter_pushdown/single_file.gz.parquet".to_string(),
- ParquetReadOptions::default(),
- )
+ ctx.read_parquet(path.into(), ParquetReadOptions::default())
.await
.unwrap()
.collect()
.await
- .unwrap();
+ .unwrap()
+}
+
+#[tokio::test]
+async fn single_file() {
+ let batches =
+ read_parquet_test_data("tests/data/filter_pushdown/single_file.gz.parquet").await;
+
+ // Set the row group size smaller so can test with fewer rows
+ let props = WriterProperties::builder()
+ .set_max_row_group_size(1024)
+ .build();
+
+ // Only create the parquet file once as it is fairly large
+ let tempdir = TempDir::new_in(Path::new(".")).unwrap();
+
let test_parquet_file =
TestParquetFile::try_new(tempdir.path().join("data.parquet"), props, batches)
.unwrap();
@@ -215,7 +219,13 @@ async fn single_file() {
}
#[tokio::test]
+#[allow(dead_code)]
async fn single_file_small_data_pages() {
+ let batches = read_parquet_test_data(
+ "tests/data/filter_pushdown/single_file_small_pages.gz.parquet",
+ )
+ .await;
+
let tempdir = TempDir::new_in(Path::new(".")).unwrap();
// Set a low row count limit to improve page filtering
@@ -225,17 +235,6 @@ async fn single_file_small_data_pages() {
.set_write_batch_size(512)
.build();
- let ctx: SessionContext = SessionContext::new();
- let batches = ctx
- .read_parquet(
- "tests/data/filter_pushdown/single_file_small_pages.gz.parquet".to_string(),
- ParquetReadOptions::default(),
- )
- .await
- .unwrap()
- .collect()
- .await
- .unwrap();
let test_parquet_file =
TestParquetFile::try_new(tempdir.path().join("data.parquet"), props, batches)
.unwrap();
diff --git a/datafusion/datasource/src/write/demux.rs b/datafusion/datasource/src/write/demux.rs
index 0ac0e5dc53..75fb557b63 100644
--- a/datafusion/datasource/src/write/demux.rs
+++ b/datafusion/datasource/src/write/demux.rs
@@ -45,7 +45,7 @@ use datafusion_execution::TaskContext;
use chrono::NaiveDate;
use futures::StreamExt;
use object_store::path::Path;
-use rand::distributions::DistString;
+use rand::distr::SampleString;
use tokio::sync::mpsc::{self, Receiver, Sender, UnboundedReceiver, UnboundedSender};
type RecordBatchReceiver = Receiver<RecordBatch>;
@@ -151,8 +151,7 @@ async fn row_count_demuxer(
let max_buffered_batches = exec_options.max_buffered_batches_per_output_file;
let minimum_parallel_files = exec_options.minimum_parallel_output_files;
let mut part_idx = 0;
- let write_id =
- rand::distributions::Alphanumeric.sample_string(&mut rand::thread_rng(), 16);
+ let write_id = rand::distr::Alphanumeric.sample_string(&mut rand::rng(), 16);
let mut open_file_streams = Vec::with_capacity(minimum_parallel_files);
@@ -267,8 +266,7 @@ async fn hive_style_partitions_demuxer(
file_extension: String,
keep_partition_by_columns: bool,
) -> Result<()> {
- let write_id =
- rand::distributions::Alphanumeric.sample_string(&mut rand::thread_rng(), 16);
+ let write_id = rand::distr::Alphanumeric.sample_string(&mut rand::rng(), 16);
let exec_options = &context.session_config().options().execution;
let max_buffered_recordbatches = exec_options.max_buffered_batches_per_output_file;
diff --git a/datafusion/execution/src/disk_manager.rs b/datafusion/execution/src/disk_manager.rs
index 9d492e7ef9..6556052a3d 100644
--- a/datafusion/execution/src/disk_manager.rs
+++ b/datafusion/execution/src/disk_manager.rs
@@ -22,7 +22,7 @@ use datafusion_common::{
};
use log::debug;
use parking_lot::Mutex;
-use rand::{thread_rng, Rng};
+use rand::{rng, Rng};
use std::path::{Path, PathBuf};
use std::sync::atomic::{AtomicU64, Ordering};
use std::sync::Arc;
@@ -194,7 +194,7 @@ impl DiskManager {
local_dirs.push(Arc::new(tempdir));
}
- let dir_index = thread_rng().gen_range(0..local_dirs.len());
+ let dir_index = rng().random_range(0..local_dirs.len());
Ok(RefCountedTempFile {
_parent_temp_dir: Arc::clone(&local_dirs[dir_index]),
tempfile: Builder::new()
diff --git a/datafusion/functions-aggregate-common/src/aggregate/groups_accumulator/accumulate.rs b/datafusion/functions-aggregate-common/src/aggregate/groups_accumulator/accumulate.rs
index e629e99e16..987ba57f77 100644
--- a/datafusion/functions-aggregate-common/src/aggregate/groups_accumulator/accumulate.rs
+++ b/datafusion/functions-aggregate-common/src/aggregate/groups_accumulator/accumulate.rs
@@ -636,7 +636,7 @@ mod test {
#[test]
fn accumulate_fuzz() {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
for _ in 0..100 {
Fixture::new_random(&mut rng).run();
}
@@ -661,23 +661,23 @@ mod test {
impl Fixture {
fn new_random(rng: &mut ThreadRng) -> Self {
// Number of input values in a batch
- let num_values: usize = rng.gen_range(1..200);
+ let num_values: usize = rng.random_range(1..200);
// number of distinct groups
- let num_groups: usize = rng.gen_range(2..1000);
+ let num_groups: usize = rng.random_range(2..1000);
let max_group = num_groups - 1;
let group_indices: Vec<usize> = (0..num_values)
- .map(|_| rng.gen_range(0..max_group))
+ .map(|_| rng.random_range(0..max_group))
.collect();
- let values: Vec<u32> = (0..num_values).map(|_| rng.gen()).collect();
+ let values: Vec<u32> = (0..num_values).map(|_| rng.random()).collect();
// 10% chance of false
// 10% change of null
// 80% chance of true
let filter: BooleanArray = (0..num_values)
.map(|_| {
- let filter_value = rng.gen_range(0.0..1.0);
+ let filter_value = rng.random_range(0.0..1.0);
if filter_value < 0.1 {
Some(false)
} else if filter_value < 0.2 {
@@ -690,14 +690,14 @@ mod test {
// random values with random number and location of nulls
// random null percentage
- let null_pct: f32 = rng.gen_range(0.0..1.0);
+ let null_pct: f32 = rng.random_range(0.0..1.0);
let values_with_nulls: Vec<Option<u32>> = (0..num_values)
.map(|_| {
- let is_null = null_pct < rng.gen_range(0.0..1.0);
+ let is_null = null_pct < rng.random_range(0.0..1.0);
if is_null {
None
} else {
- Some(rng.gen())
+ Some(rng.random())
}
})
.collect();
diff --git a/datafusion/functions-aggregate/benches/array_agg.rs b/datafusion/functions-aggregate/benches/array_agg.rs
index a3a31a51be..6dadb12aba 100644
--- a/datafusion/functions-aggregate/benches/array_agg.rs
+++ b/datafusion/functions-aggregate/benches/array_agg.rs
@@ -27,7 +27,7 @@ use datafusion_expr::Accumulator;
use datafusion_functions_aggregate::array_agg::ArrayAggAccumulator;
use arrow::buffer::OffsetBuffer;
-use rand::distributions::{Distribution, Standard};
+use rand::distr::{Distribution, StandardUniform};
use rand::prelude::StdRng;
use rand::Rng;
use rand::SeedableRng;
@@ -55,23 +55,23 @@ fn merge_batch_bench(c: &mut Criterion, name: &str, values: ArrayRef) {
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();
(0..size)
.map(|_| {
- if rng.gen::<f32>() < null_density {
+ if rng.random::<f32>() < null_density {
None
} else {
- Some(rng.gen())
+ Some(rng.random())
}
})
.collect()
}
/// Create List array with the given item data type, null density, null locations and zero length lists density
-/// Creates an random (but fixed-seeded) array of a given size and null density
+/// Creates a random (but fixed-seeded) array of a given size and null density
pub fn create_list_array<T>(
size: usize,
null_density: f32,
@@ -79,20 +79,20 @@ pub fn create_list_array<T>(
) -> ListArray
where
T: ArrowPrimitiveType,
- Standard: Distribution<T::Native>,
+ StandardUniform: Distribution<T::Native>,
{
let mut nulls_builder = NullBufferBuilder::new(size);
- let mut rng = seedable_rng();
+ let mut rng = StdRng::seed_from_u64(42);
let offsets = OffsetBuffer::from_lengths((0..size).map(|_| {
- let is_null = rng.gen::<f32>() < null_density;
+ let is_null = rng.random::<f32>() < null_density;
- let mut length = rng.gen_range(1..10);
+ let mut length = rng.random_range(1..10);
if is_null {
nulls_builder.append_null();
- if rng.gen::<f32>() <= zero_length_lists_probability {
+ if rng.random::<f32>() <= zero_length_lists_probability {
length = 0;
}
} else {
diff --git a/datafusion/functions-aggregate/src/min_max.rs b/datafusion/functions-aggregate/src/min_max.rs
index f6b1589aca..9a026e171d 100644
--- a/datafusion/functions-aggregate/src/min_max.rs
+++ b/datafusion/functions-aggregate/src/min_max.rs
@@ -1863,10 +1863,10 @@ mod tests {
use rand::Rng;
fn get_random_vec_i32(len: usize) -> Vec<i32> {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let mut input = Vec::with_capacity(len);
for _i in 0..len {
- input.push(rng.gen_range(0..100));
+ input.push(rng.random_range(0..100));
}
input
}
diff --git a/datafusion/functions-nested/benches/map.rs b/datafusion/functions-nested/benches/map.rs
index d8502e314b..e861de95d8 100644
--- a/datafusion/functions-nested/benches/map.rs
+++ b/datafusion/functions-nested/benches/map.rs
@@ -36,7 +36,7 @@ fn keys(rng: &mut ThreadRng) -> Vec<String> {
let mut keys = HashSet::with_capacity(1000);
while keys.len() < 1000 {
- keys.insert(rng.gen_range(0..10000).to_string());
+ keys.insert(rng.random_range(0..10000).to_string());
}
keys.into_iter().collect()
@@ -46,14 +46,14 @@ fn values(rng: &mut ThreadRng) -> Vec<i32> {
let mut values = HashSet::with_capacity(1000);
while values.len() < 1000 {
- values.insert(rng.gen_range(0..10000));
+ values.insert(rng.random_range(0..10000));
}
values.into_iter().collect()
}
fn criterion_benchmark(c: &mut Criterion) {
c.bench_function("make_map_1000", |b| {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let keys = keys(&mut rng);
let values = values(&mut rng);
let mut buffer = Vec::new();
@@ -74,7 +74,7 @@ fn criterion_benchmark(c: &mut Criterion) {
});
c.bench_function("map_1000", |b| {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let field = Arc::new(Field::new_list_field(DataType::Utf8, true));
let offsets = OffsetBuffer::new(ScalarBuffer::from(vec![0, 1000]));
let key_list = ListArray::new(
diff --git a/datafusion/functions/benches/chr.rs b/datafusion/functions/benches/chr.rs
index 874c0d6423..2236424542 100644
--- a/datafusion/functions/benches/chr.rs
+++ b/datafusion/functions/benches/chr.rs
@@ -37,13 +37,13 @@ fn criterion_benchmark(c: &mut Criterion) {
let size = 1024;
let input: PrimitiveArray<Int64Type> = {
let null_density = 0.2;
- let mut rng = seedable_rng();
+ let mut rng = StdRng::seed_from_u64(42);
(0..size)
.map(|_| {
- if rng.gen::<f32>() < null_density {
+ if rng.random::<f32>() < null_density {
None
} else {
- Some(rng.gen_range::<i64, _>(1i64..10_000))
+ Some(rng.random_range::<i64, _>(1i64..10_000))
}
})
.collect()
diff --git a/datafusion/functions/benches/date_bin.rs b/datafusion/functions/benches/date_bin.rs
index 23eef1a014..7cc1989dc8 100644
--- a/datafusion/functions/benches/date_bin.rs
+++ b/datafusion/functions/benches/date_bin.rs
@@ -32,7 +32,7 @@ use datafusion_functions::datetime::date_bin;
fn timestamps(rng: &mut ThreadRng) -> TimestampSecondArray {
let mut seconds = vec![];
for _ in 0..1000 {
- seconds.push(rng.gen_range(0..1_000_000));
+ seconds.push(rng.random_range(0..1_000_000));
}
TimestampSecondArray::from(seconds)
@@ -40,7 +40,7 @@ fn timestamps(rng: &mut ThreadRng) -> TimestampSecondArray {
fn criterion_benchmark(c: &mut Criterion) {
c.bench_function("date_bin_1000", |b| {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let timestamps_array = Arc::new(timestamps(&mut rng)) as ArrayRef;
let batch_len = timestamps_array.len();
let interval = ColumnarValue::Scalar(ScalarValue::new_interval_dt(0, 1_000_000));
diff --git a/datafusion/functions/benches/date_trunc.rs b/datafusion/functions/benches/date_trunc.rs
index 780cbae615..e40b7a0ad5 100644
--- a/datafusion/functions/benches/date_trunc.rs
+++ b/datafusion/functions/benches/date_trunc.rs
@@ -32,7 +32,7 @@ use datafusion_functions::datetime::date_trunc;
fn timestamps(rng: &mut ThreadRng) -> TimestampSecondArray {
let mut seconds = vec![];
for _ in 0..1000 {
- seconds.push(rng.gen_range(0..1_000_000));
+ seconds.push(rng.random_range(0..1_000_000));
}
TimestampSecondArray::from(seconds)
@@ -40,7 +40,7 @@ fn timestamps(rng: &mut ThreadRng) -> TimestampSecondArray {
fn criterion_benchmark(c: &mut Criterion) {
c.bench_function("date_trunc_minute_1000", |b| {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let timestamps_array = Arc::new(timestamps(&mut rng)) as ArrayRef;
let batch_len = timestamps_array.len();
let precision =
diff --git a/datafusion/functions/benches/find_in_set.rs b/datafusion/functions/benches/find_in_set.rs
index 787a93ea5d..d1cb0f7025 100644
--- a/datafusion/functions/benches/find_in_set.rs
+++ b/datafusion/functions/benches/find_in_set.rs
@@ -25,7 +25,7 @@ use arrow::util::bench_util::{
use criterion::{black_box, criterion_group, criterion_main, Criterion, SamplingMode};
use datafusion_common::ScalarValue;
use datafusion_expr::{ColumnarValue, ScalarFunctionArgs};
-use rand::distributions::Alphanumeric;
+use rand::distr::Alphanumeric;
use rand::prelude::StdRng;
use rand::{Rng, SeedableRng};
use std::sync::Arc;
@@ -51,7 +51,7 @@ fn gen_args_array(
let mut output_set_vec: Vec<Option<String>> = Vec::with_capacity(n_rows);
let mut output_element_vec: Vec<Option<String>> = Vec::with_capacity(n_rows);
for _ in 0..n_rows {
- let rand_num = rng_ref.gen::<f32>(); // [0.0, 1.0)
+ let rand_num = rng_ref.random::<f32>(); // [0.0, 1.0)
if rand_num < null_density {
output_element_vec.push(None);
output_set_vec.push(None);
@@ -60,7 +60,7 @@ fn gen_args_array(
let mut generated_string = String::with_capacity(str_len_chars);
for i in 0..num_elements {
for _ in 0..str_len_chars {
- let idx = rng_ref.gen_range(0..corpus_char_count);
+ let idx = rng_ref.random_range(0..corpus_char_count);
let char = utf8.chars().nth(idx).unwrap();
generated_string.push(char);
}
@@ -112,7 +112,7 @@ fn random_element_in_set(string: &str) -> String {
}
let mut rng = StdRng::seed_from_u64(44);
- let random_index = rng.gen_range(0..elements.len());
+ let random_index = rng.random_range(0..elements.len());
elements[random_index].to_string()
}
diff --git a/datafusion/functions/benches/gcd.rs b/datafusion/functions/benches/gcd.rs
index c56f6aae1c..44a6e35931 100644
--- a/datafusion/functions/benches/gcd.rs
+++ b/datafusion/functions/benches/gcd.rs
@@ -30,9 +30,9 @@ use rand::Rng;
use std::sync::Arc;
fn generate_i64_array(n_rows: usize) -> ArrayRef {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let values = (0..n_rows)
- .map(|_| rng.gen_range(0..1000))
+ .map(|_| rng.random_range(0..1000))
.collect::<Vec<_>>();
Arc::new(Int64Array::from(values)) as ArrayRef
}
diff --git a/datafusion/functions/benches/helper.rs b/datafusion/functions/benches/helper.rs
index 0dbb4b0027..a2b110ae4d 100644
--- a/datafusion/functions/benches/helper.rs
+++ b/datafusion/functions/benches/helper.rs
@@ -17,7 +17,7 @@
use arrow::array::{StringArray, StringViewArray};
use datafusion_expr::ColumnarValue;
-use rand::distributions::Alphanumeric;
+use rand::distr::Alphanumeric;
use rand::{rngs::StdRng, Rng, SeedableRng};
use std::sync::Arc;
@@ -39,14 +39,14 @@ pub fn gen_string_array(
let mut output_string_vec: Vec<Option<String>> = Vec::with_capacity(n_rows);
for _ in 0..n_rows {
- let rand_num = rng_ref.gen::<f32>(); // [0.0, 1.0)
+ let rand_num = rng_ref.random::<f32>(); // [0.0, 1.0)
if rand_num < null_density {
output_string_vec.push(None);
} else if rand_num < null_density + utf8_density {
// Generate random UTF8 string
let mut generated_string = String::with_capacity(str_len_chars);
for _ in 0..str_len_chars {
- let char = corpus[rng_ref.gen_range(0..corpus.len())];
+ let char = corpus[rng_ref.random_range(0..corpus.len())];
generated_string.push(char);
}
output_string_vec.push(Some(generated_string));
diff --git a/datafusion/functions/benches/ltrim.rs b/datafusion/functions/benches/ltrim.rs
index b5371439c1..6b2b7625ca 100644
--- a/datafusion/functions/benches/ltrim.rs
+++ b/datafusion/functions/benches/ltrim.rs
@@ -26,13 +26,9 @@ use criterion::{
use datafusion_common::ScalarValue;
use datafusion_expr::{ColumnarValue, ScalarFunctionArgs, ScalarUDF};
use datafusion_functions::string;
-use rand::{distributions::Alphanumeric, rngs::StdRng, Rng, SeedableRng};
+use rand::{distr::Alphanumeric, rngs::StdRng, Rng, SeedableRng};
use std::{fmt, sync::Arc};
-pub fn seedable_rng() -> StdRng {
- StdRng::seed_from_u64(42)
-}
-
#[derive(Clone, Copy)]
pub enum StringArrayType {
Utf8View,
@@ -58,14 +54,14 @@ pub fn create_string_array_and_characters(
remaining_len: usize,
string_array_type: StringArrayType,
) -> (ArrayRef, ScalarValue) {
- let rng = &mut seedable_rng();
+ let rng = &mut StdRng::seed_from_u64(42);
// Create `size` rows:
// - 10% rows will be `None`
// - Other 90% will be strings with same `remaining_len` lengths
// We will build the string array on it later.
let string_iter = (0..size).map(|_| {
- if rng.gen::<f32>() < 0.1 {
+ if rng.random::<f32>() < 0.1 {
None
} else {
let mut value = trimmed.as_bytes().to_vec();
diff --git a/datafusion/functions/benches/make_date.rs b/datafusion/functions/benches/make_date.rs
index 8e0fe5992f..18d4e24cc7 100644
--- a/datafusion/functions/benches/make_date.rs
+++ b/datafusion/functions/benches/make_date.rs
@@ -32,7 +32,7 @@ use datafusion_functions::datetime::make_date;
fn years(rng: &mut ThreadRng) -> Int32Array {
let mut years = vec![];
for _ in 0..1000 {
- years.push(rng.gen_range(1900..2050));
+ years.push(rng.random_range(1900..2050));
}
Int32Array::from(years)
@@ -41,7 +41,7 @@ fn years(rng: &mut ThreadRng) -> Int32Array {
fn months(rng: &mut ThreadRng) -> Int32Array {
let mut months = vec![];
for _ in 0..1000 {
- months.push(rng.gen_range(1..13));
+ months.push(rng.random_range(1..13));
}
Int32Array::from(months)
@@ -50,14 +50,14 @@ fn months(rng: &mut ThreadRng) -> Int32Array {
fn days(rng: &mut ThreadRng) -> Int32Array {
let mut days = vec![];
for _ in 0..1000 {
- days.push(rng.gen_range(1..29));
+ days.push(rng.random_range(1..29));
}
Int32Array::from(days)
}
fn criterion_benchmark(c: &mut Criterion) {
c.bench_function("make_date_col_col_col_1000", |b| {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let years_array = Arc::new(years(&mut rng)) as ArrayRef;
let batch_len = years_array.len();
let years = ColumnarValue::Array(years_array);
@@ -83,7 +83,7 @@ fn criterion_benchmark(c: &mut Criterion) {
});
c.bench_function("make_date_scalar_col_col_1000", |b| {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let year = ColumnarValue::Scalar(ScalarValue::Int32(Some(2025)));
let months_arr = Arc::new(months(&mut rng)) as ArrayRef;
let batch_len = months_arr.len();
@@ -109,7 +109,7 @@ fn criterion_benchmark(c: &mut Criterion) {
});
c.bench_function("make_date_scalar_scalar_col_1000", |b| {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let year = ColumnarValue::Scalar(ScalarValue::Int32(Some(2025)));
let month = ColumnarValue::Scalar(ScalarValue::Int32(Some(11)));
let day_arr = Arc::new(days(&mut rng));
diff --git a/datafusion/functions/benches/pad.rs b/datafusion/functions/benches/pad.rs
index c484a58358..87ff345443 100644
--- a/datafusion/functions/benches/pad.rs
+++ b/datafusion/functions/benches/pad.rs
@@ -24,7 +24,7 @@ use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
use datafusion_common::DataFusionError;
use datafusion_expr::{ColumnarValue, ScalarFunctionArgs};
use datafusion_functions::unicode::{lpad, rpad};
-use rand::distributions::{Distribution, Uniform};
+use rand::distr::{Distribution, Uniform};
use rand::Rng;
use std::sync::Arc;
@@ -53,13 +53,13 @@ where
dist: Uniform::new_inclusive::<i64, i64>(0, len as i64),
};
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
(0..size)
.map(|_| {
- if rng.gen::<f32>() < null_density {
+ if rng.random::<f32>() < null_density {
None
} else {
- Some(rng.sample(&dist))
+ Some(rng.sample(dist.dist.unwrap()))
}
})
.collect()
diff --git a/datafusion/functions/benches/regx.rs b/datafusion/functions/benches/regx.rs
index 3a1a6a7117..c0b50ad62f 100644
--- a/datafusion/functions/benches/regx.rs
+++ b/datafusion/functions/benches/regx.rs
@@ -26,9 +26,9 @@ use datafusion_functions::regex::regexpcount::regexp_count_func;
use datafusion_functions::regex::regexplike::regexp_like;
use datafusion_functions::regex::regexpmatch::regexp_match;
use datafusion_functions::regex::regexpreplace::regexp_replace;
-use rand::distributions::Alphanumeric;
+use rand::distr::Alphanumeric;
+use rand::prelude::IndexedRandom;
use rand::rngs::ThreadRng;
-use rand::seq::SliceRandom;
use rand::Rng;
use std::iter;
use std::sync::Arc;
@@ -65,7 +65,7 @@ fn regex(rng: &mut ThreadRng) -> StringArray {
fn start(rng: &mut ThreadRng) -> Int64Array {
let mut data: Vec<i64> = vec![];
for _ in 0..1000 {
- data.push(rng.gen_range(1..5));
+ data.push(rng.random_range(1..5));
}
Int64Array::from(data)
@@ -88,7 +88,7 @@ fn flags(rng: &mut ThreadRng) -> StringArray {
fn criterion_benchmark(c: &mut Criterion) {
c.bench_function("regexp_count_1000 string", |b| {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let data = Arc::new(data(&mut rng)) as ArrayRef;
let regex = Arc::new(regex(&mut rng)) as ArrayRef;
let start = Arc::new(start(&mut rng)) as ArrayRef;
@@ -108,7 +108,7 @@ fn criterion_benchmark(c: &mut Criterion) {
});
c.bench_function("regexp_count_1000 utf8view", |b| {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let data = cast(&data(&mut rng), &DataType::Utf8View).unwrap();
let regex = cast(®ex(&mut rng), &DataType::Utf8View).unwrap();
let start = Arc::new(start(&mut rng)) as ArrayRef;
@@ -128,7 +128,7 @@ fn criterion_benchmark(c: &mut Criterion) {
});
c.bench_function("regexp_like_1000", |b| {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let data = Arc::new(data(&mut rng)) as ArrayRef;
let regex = Arc::new(regex(&mut rng)) as ArrayRef;
let flags = Arc::new(flags(&mut rng)) as ArrayRef;
@@ -142,7 +142,7 @@ fn criterion_benchmark(c: &mut Criterion) {
});
c.bench_function("regexp_like_1000 utf8view", |b| {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let data = cast(&data(&mut rng), &DataType::Utf8View).unwrap();
let regex = cast(®ex(&mut rng), &DataType::Utf8View).unwrap();
let flags = cast(&flags(&mut rng), &DataType::Utf8View).unwrap();
@@ -156,7 +156,7 @@ fn criterion_benchmark(c: &mut Criterion) {
});
c.bench_function("regexp_match_1000", |b| {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let data = Arc::new(data(&mut rng)) as ArrayRef;
let regex = Arc::new(regex(&mut rng)) as ArrayRef;
let flags = Arc::new(flags(&mut rng)) as ArrayRef;
@@ -174,7 +174,7 @@ fn criterion_benchmark(c: &mut Criterion) {
});
c.bench_function("regexp_match_1000 utf8view", |b| {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let data = cast(&data(&mut rng), &DataType::Utf8View).unwrap();
let regex = cast(®ex(&mut rng), &DataType::Utf8View).unwrap();
let flags = cast(&flags(&mut rng), &DataType::Utf8View).unwrap();
@@ -192,7 +192,7 @@ fn criterion_benchmark(c: &mut Criterion) {
});
c.bench_function("regexp_replace_1000", |b| {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let data = Arc::new(data(&mut rng)) as ArrayRef;
let regex = Arc::new(regex(&mut rng)) as ArrayRef;
let flags = Arc::new(flags(&mut rng)) as ArrayRef;
@@ -214,7 +214,7 @@ fn criterion_benchmark(c: &mut Criterion) {
});
c.bench_function("regexp_replace_1000 utf8view", |b| {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let data = cast(&data(&mut rng), &DataType::Utf8View).unwrap();
let regex = cast(®ex(&mut rng), &DataType::Utf8View).unwrap();
// flags are not allowed to be utf8view according to the function
diff --git a/datafusion/functions/benches/strpos.rs b/datafusion/functions/benches/strpos.rs
index 5dcc326a97..23fd634b65 100644
--- a/datafusion/functions/benches/strpos.rs
+++ b/datafusion/functions/benches/strpos.rs
@@ -21,7 +21,7 @@ use arrow::array::{StringArray, StringViewArray};
use arrow::datatypes::{DataType, Field};
use criterion::{black_box, criterion_group, criterion_main, Criterion};
use datafusion_expr::{ColumnarValue, ScalarFunctionArgs};
-use rand::distributions::Alphanumeric;
+use rand::distr::Alphanumeric;
use rand::prelude::StdRng;
use rand::{Rng, SeedableRng};
use std::str::Chars;
@@ -46,7 +46,7 @@ fn gen_string_array(
let mut output_string_vec: Vec<Option<String>> = Vec::with_capacity(n_rows);
let mut output_sub_string_vec: Vec<Option<String>> = Vec::with_capacity(n_rows);
for _ in 0..n_rows {
- let rand_num = rng_ref.gen::<f32>(); // [0.0, 1.0)
+ let rand_num = rng_ref.random::<f32>(); // [0.0, 1.0)
if rand_num < null_density {
output_sub_string_vec.push(None);
output_string_vec.push(None);
@@ -54,7 +54,7 @@ fn gen_string_array(
// Generate random UTF8 string
let mut generated_string = String::with_capacity(str_len_chars);
for _ in 0..str_len_chars {
- let idx = rng_ref.gen_range(0..corpus_char_count);
+ let idx = rng_ref.random_range(0..corpus_char_count);
let char = utf8.chars().nth(idx).unwrap();
generated_string.push(char);
}
@@ -94,8 +94,8 @@ fn random_substring(chars: Chars) -> String {
// get the substring of a random length from the input string by byte unit
let mut rng = StdRng::seed_from_u64(44);
let count = chars.clone().count();
- let start = rng.gen_range(0..count - 1);
- let end = rng.gen_range(start + 1..count);
+ let start = rng.random_range(0..count - 1);
+ let end = rng.random_range(start + 1..count);
chars
.enumerate()
.filter(|(i, _)| *i >= start && *i < end)
diff --git a/datafusion/functions/benches/substr_index.rs b/datafusion/functions/benches/substr_index.rs
index 5604f7b6a9..536d8c019d 100644
--- a/datafusion/functions/benches/substr_index.rs
+++ b/datafusion/functions/benches/substr_index.rs
@@ -22,7 +22,7 @@ use std::sync::Arc;
use arrow::array::{ArrayRef, Int64Array, StringArray};
use arrow::datatypes::{DataType, Field};
use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use rand::distributions::{Alphanumeric, Uniform};
+use rand::distr::{Alphanumeric, Uniform};
use rand::prelude::Distribution;
use rand::Rng;
@@ -54,21 +54,21 @@ fn data() -> (StringArray, StringArray, Int64Array) {
dist: Uniform::new(-4, 5),
test: |x: &i64| x != &0,
};
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let mut strings: Vec<String> = vec![];
let mut delimiters: Vec<String> = vec![];
let mut counts: Vec<i64> = vec![];
for _ in 0..1000 {
- let length = rng.gen_range(20..50);
+ let length = rng.random_range(20..50);
let text: String = (&mut rng)
.sample_iter(&Alphanumeric)
.take(length)
.map(char::from)
.collect();
- let char = rng.gen_range(0..text.len());
+ let char = rng.random_range(0..text.len());
let delimiter = &text.chars().nth(char).unwrap();
- let count = rng.sample(&dist);
+ let count = rng.sample(dist.dist.unwrap());
strings.push(text);
delimiters.push(delimiter.to_string());
diff --git a/datafusion/functions/benches/to_char.rs b/datafusion/functions/benches/to_char.rs
index 9189455fd3..ef51a017a2 100644
--- a/datafusion/functions/benches/to_char.rs
+++ b/datafusion/functions/benches/to_char.rs
@@ -24,8 +24,8 @@ use arrow::datatypes::{DataType, Field};
use chrono::prelude::*;
use chrono::TimeDelta;
use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use rand::prelude::IndexedRandom;
use rand::rngs::ThreadRng;
-use rand::seq::SliceRandom;
use rand::Rng;
use datafusion_common::ScalarValue;
@@ -39,7 +39,7 @@ fn random_date_in_range(
end_date: NaiveDate,
) -> NaiveDate {
let days_in_range = (end_date - start_date).num_days();
- let random_days: i64 = rng.gen_range(0..days_in_range);
+ let random_days: i64 = rng.random_range(0..days_in_range);
start_date + TimeDelta::try_days(random_days).unwrap()
}
@@ -82,7 +82,7 @@ fn patterns(rng: &mut ThreadRng) -> StringArray {
fn criterion_benchmark(c: &mut Criterion) {
c.bench_function("to_char_array_array_1000", |b| {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let data_arr = data(&mut rng);
let batch_len = data_arr.len();
let data = ColumnarValue::Array(Arc::new(data_arr) as ArrayRef);
@@ -106,7 +106,7 @@ fn criterion_benchmark(c: &mut Criterion) {
});
c.bench_function("to_char_array_scalar_1000", |b| {
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let data_arr = data(&mut rng);
let batch_len = data_arr.len();
let data = ColumnarValue::Array(Arc::new(data_arr) as ArrayRef);
diff --git a/datafusion/functions/src/math/random.rs b/datafusion/functions/src/math/random.rs
index 607f9fb09f..92b6ed1895 100644
--- a/datafusion/functions/src/math/random.rs
+++ b/datafusion/functions/src/math/random.rs
@@ -21,7 +21,7 @@ use std::sync::Arc;
use arrow::array::Float64Array;
use arrow::datatypes::DataType;
use arrow::datatypes::DataType::Float64;
-use rand::{thread_rng, Rng};
+use rand::{rng, Rng};
use datafusion_common::{internal_err, Result};
use datafusion_expr::{ColumnarValue, ScalarFunctionArgs};
@@ -74,9 +74,9 @@ impl ScalarUDFImpl for RandomFunc {
if !args.args.is_empty() {
return internal_err!("{} function does not accept arguments", self.name());
}
- let mut rng = thread_rng();
+ let mut rng = rng();
let mut values = vec![0.0; args.number_rows];
- // Equivalent to set each element with rng.gen_range(0.0..1.0), but more efficient
+ // Equivalent to set each element with rng.random_range(0.0..1.0), but more efficient
rng.fill(&mut values[..]);
let array = Float64Array::from(values);
diff --git a/datafusion/functions/src/string/uuid.rs b/datafusion/functions/src/string/uuid.rs
index d1f43d5480..29415a9b20 100644
--- a/datafusion/functions/src/string/uuid.rs
+++ b/datafusion/functions/src/string/uuid.rs
@@ -86,7 +86,7 @@ impl ScalarUDFImpl for UuidFunc {
}
// Generate random u128 values
- let mut rng = rand::thread_rng();
+ let mut rng = rand::rng();
let mut randoms = vec![0u128; args.number_rows];
rng.fill(&mut randoms[..]);
diff --git a/datafusion/physical-expr/benches/in_list.rs b/datafusion/physical-expr/benches/in_list.rs
index 90bfc5efb6..e91e8d1f13 100644
--- a/datafusion/physical-expr/benches/in_list.rs
+++ b/datafusion/physical-expr/benches/in_list.rs
@@ -21,7 +21,7 @@ use arrow::record_batch::RecordBatch;
use criterion::{black_box, criterion_group, criterion_main, Criterion};
use datafusion_common::ScalarValue;
use datafusion_physical_expr::expressions::{col, in_list, lit};
-use rand::distributions::Alphanumeric;
+use rand::distr::Alphanumeric;
use rand::prelude::*;
use std::sync::Arc;
@@ -51,7 +51,7 @@ fn do_benches(
for string_length in [5, 10, 20] {
let values: StringArray = (0..array_length)
.map(|_| {
- rng.gen_bool(null_percent)
+ rng.random_bool(null_percent)
.then(|| random_string(&mut rng, string_length))
})
.collect();
@@ -71,11 +71,11 @@ fn do_benches(
}
let values: Float32Array = (0..array_length)
- .map(|_| rng.gen_bool(null_percent).then(|| rng.gen()))
+ .map(|_| rng.random_bool(null_percent).then(|| rng.random()))
.collect();
let in_list: Vec<_> = (0..in_list_length)
- .map(|_| ScalarValue::Float32(Some(rng.gen())))
+ .map(|_| ScalarValue::Float32(Some(rng.random())))
.collect();
do_bench(
@@ -86,11 +86,11 @@ fn do_benches(
);
let values: Int32Array = (0..array_length)
- .map(|_| rng.gen_bool(null_percent).then(|| rng.gen()))
+ .map(|_| rng.random_bool(null_percent).then(|| rng.random()))
.collect();
let in_list: Vec<_> = (0..in_list_length)
- .map(|_| ScalarValue::Int32(Some(rng.gen())))
+ .map(|_| ScalarValue::Int32(Some(rng.random())))
.collect();
do_bench(
diff --git a/datafusion/physical-expr/src/intervals/cp_solver.rs b/datafusion/physical-expr/src/intervals/cp_solver.rs
index bcd67bf869..28f76bbfd1 100644
--- a/datafusion/physical-expr/src/intervals/cp_solver.rs
+++ b/datafusion/physical-expr/src/intervals/cp_solver.rs
@@ -868,8 +868,8 @@ mod tests {
let mut r = StdRng::seed_from_u64(seed);
let (left_given, right_given, left_expected, right_expected) = if ASC {
- let left = r.gen_range((0 as $TYPE)..(1000 as $TYPE));
- let right = r.gen_range((0 as $TYPE)..(1000 as $TYPE));
+ let left = r.random_range((0 as $TYPE)..(1000 as $TYPE));
+ let right = r.random_range((0 as $TYPE)..(1000 as $TYPE));
(
(Some(left), None),
(Some(right), None),
@@ -877,8 +877,8 @@ mod tests {
(Some(<$TYPE>::max(right, left + expr_right)), None),
)
} else {
- let left = r.gen_range((0 as $TYPE)..(1000 as $TYPE));
- let right = r.gen_range((0 as $TYPE)..(1000 as $TYPE));
+ let left = r.random_range((0 as $TYPE)..(1000 as $TYPE));
+ let right = r.random_range((0 as $TYPE)..(1000 as $TYPE));
(
(None, Some(left)),
(None, Some(right)),
diff --git a/datafusion/physical-plan/src/joins/test_utils.rs b/datafusion/physical-plan/src/joins/test_utils.rs
index d38637dae0..81f56c865f 100644
--- a/datafusion/physical-plan/src/joins/test_utils.rs
+++ b/datafusion/physical-plan/src/joins/test_utils.rs
@@ -195,7 +195,7 @@ struct AscendingRandomFloatIterator {
impl AscendingRandomFloatIterator {
fn new(min: f64, max: f64) -> Self {
let mut rng = StdRng::seed_from_u64(42);
- let initial = rng.gen_range(min..max);
+ let initial = rng.random_range(min..max);
AscendingRandomFloatIterator {
prev: initial,
max,
@@ -208,7 +208,7 @@ impl Iterator for AscendingRandomFloatIterator {
type Item = f64;
fn next(&mut self) -> Option<Self::Item> {
- let value = self.rng.gen_range(self.prev..self.max);
+ let value = self.rng.random_range(self.prev..self.max);
self.prev = value;
Some(value)
}
diff --git a/datafusion/proto/Cargo.toml b/datafusion/proto/Cargo.toml
index 92e697ad2d..a1eeabdf87 100644
--- a/datafusion/proto/Cargo.toml
+++ b/datafusion/proto/Cargo.toml
@@ -60,5 +60,4 @@ datafusion-functions = { workspace = true, default-features = true }
datafusion-functions-aggregate = { workspace = true }
datafusion-functions-window-common = { workspace = true }
doc-comment = { workspace = true }
-strum = { version = "0.27.1", features = ["derive"] }
tokio = { workspace = true, features = ["rt-multi-thread"] }
diff --git a/datafusion/wasmtest/Cargo.toml b/datafusion/wasmtest/Cargo.toml
index 10eab02573..b43c34f197 100644
--- a/datafusion/wasmtest/Cargo.toml
+++ b/datafusion/wasmtest/Cargo.toml
@@ -52,14 +52,13 @@ datafusion-expr = { workspace = true }
datafusion-optimizer = { workspace = true, default-features = true }
datafusion-physical-plan = { workspace = true }
datafusion-sql = { workspace = true }
-# getrandom must be compiled with js feature
-getrandom = { version = "0.2.8", features = ["js"] }
-
+getrandom = { version = "0.3", features = ["wasm_js"] }
wasm-bindgen = "0.2.99"
[dev-dependencies]
insta = { workspace = true }
object_store = { workspace = true }
+# needs to be compiled
tokio = { workspace = true }
url = { workspace = true }
wasm-bindgen-test = "0.3.49"
diff --git a/test-utils/src/array_gen/binary.rs b/test-utils/src/array_gen/binary.rs
index d342118fa8..9740eeae5e 100644
--- a/test-utils/src/array_gen/binary.rs
+++ b/test-utils/src/array_gen/binary.rs
@@ -46,11 +46,11 @@ impl BinaryArrayGenerator {
// Pick num_binaries randomly from the distinct binary table
let indices: UInt32Array = (0..self.num_binaries)
.map(|_| {
- if self.rng.gen::<f64>() < self.null_pct {
+ if self.rng.random::<f64>() < self.null_pct {
None
} else if self.num_distinct_binaries > 1 {
let range = 0..(self.num_distinct_binaries as u32);
- Some(self.rng.gen_range(range))
+ Some(self.rng.random_range(range))
} else {
Some(0)
}
@@ -68,11 +68,11 @@ impl BinaryArrayGenerator {
let indices: UInt32Array = (0..self.num_binaries)
.map(|_| {
- if self.rng.gen::<f64>() < self.null_pct {
+ if self.rng.random::<f64>() < self.null_pct {
None
} else if self.num_distinct_binaries > 1 {
let range = 0..(self.num_distinct_binaries as u32);
- Some(self.rng.gen_range(range))
+ Some(self.rng.random_range(range))
} else {
Some(0)
}
@@ -88,7 +88,7 @@ fn random_binary(rng: &mut StdRng, max_len: usize) -> Vec<u8> {
if max_len == 0 {
Vec::new()
} else {
- let len = rng.gen_range(1..=max_len);
- (0..len).map(|_| rng.gen()).collect()
+ let len = rng.random_range(1..=max_len);
+ (0..len).map(|_| rng.random()).collect()
}
}
diff --git a/test-utils/src/array_gen/boolean.rs b/test-utils/src/array_gen/boolean.rs
index f3b83dd245..004d615b4c 100644
--- a/test-utils/src/array_gen/boolean.rs
+++ b/test-utils/src/array_gen/boolean.rs
@@ -34,7 +34,7 @@ impl BooleanArrayGenerator {
// Table of booleans from which to draw (distinct means 1 or 2)
let distinct_booleans: BooleanArray = match self.num_distinct_booleans {
1 => {
- let value = self.rng.gen::<bool>();
+ let value = self.rng.random::<bool>();
let mut builder = BooleanBuilder::with_capacity(1);
builder.append_value(value);
builder.finish()
@@ -51,10 +51,10 @@ impl BooleanArrayGenerator {
// Generate indices to select from the distinct booleans
let indices: UInt32Array = (0..self.num_booleans)
.map(|_| {
- if self.rng.gen::<f64>() < self.null_pct {
+ if self.rng.random::<f64>() < self.null_pct {
None
} else if self.num_distinct_booleans > 1 {
- Some(self.rng.gen_range(0..self.num_distinct_booleans as u32))
+ Some(self.rng.random_range(0..self.num_distinct_booleans as u32))
} else {
Some(0)
}
diff --git a/test-utils/src/array_gen/decimal.rs b/test-utils/src/array_gen/decimal.rs
index d46ea9fe54..c5ec8ac5e8 100644
--- a/test-utils/src/array_gen/decimal.rs
+++ b/test-utils/src/array_gen/decimal.rs
@@ -62,11 +62,11 @@ impl DecimalArrayGenerator {
// pick num_decimals randomly from the distinct decimal table
let indices: UInt32Array = (0..self.num_decimals)
.map(|_| {
- if self.rng.gen::<f64>() < self.null_pct {
+ if self.rng.random::<f64>() < self.null_pct {
None
} else if self.num_distinct_decimals > 1 {
let range = 1..(self.num_distinct_decimals as u32);
- Some(self.rng.gen_range(range))
+ Some(self.rng.random_range(range))
} else {
Some(0)
}
diff --git a/test-utils/src/array_gen/primitive.rs b/test-utils/src/array_gen/primitive.rs
index 1897b0d3db..62a38a1b4c 100644
--- a/test-utils/src/array_gen/primitive.rs
+++ b/test-utils/src/array_gen/primitive.rs
@@ -18,7 +18,8 @@
use arrow::array::{ArrayRef, ArrowPrimitiveType, PrimitiveArray, UInt32Array};
use arrow::datatypes::DataType;
use chrono_tz::{Tz, TZ_VARIANTS};
-use rand::{rngs::StdRng, seq::SliceRandom, thread_rng, Rng};
+use rand::prelude::IndexedRandom;
+use rand::{rng, rngs::StdRng, Rng};
use std::sync::Arc;
use super::random_data::RandomNativeData;
@@ -82,11 +83,11 @@ impl PrimitiveArrayGenerator {
// pick num_primitives randomly from the distinct string table
let indices: UInt32Array = (0..self.num_primitives)
.map(|_| {
- if self.rng.gen::<f64>() < self.null_pct {
+ if self.rng.random::<f64>() < self.null_pct {
None
} else if self.num_distinct_primitives > 1 {
let range = 1..(self.num_distinct_primitives as u32);
- Some(self.rng.gen_range(range))
+ Some(self.rng.random_range(range))
} else {
Some(0)
}
@@ -103,7 +104,7 @@ impl PrimitiveArrayGenerator {
/// - `Some(Arc<String>)` containing the timezone name.
/// - `None` if no timezone is selected.
fn generate_timezone() -> Option<Arc<str>> {
- let mut rng = thread_rng();
+ let mut rng = rng();
// Allows for timezones + None
let mut timezone_options: Vec<Option<&Tz>> = vec![None];
diff --git a/test-utils/src/array_gen/random_data.rs b/test-utils/src/array_gen/random_data.rs
index 3989e4842f..78518b7bf9 100644
--- a/test-utils/src/array_gen/random_data.rs
+++ b/test-utils/src/array_gen/random_data.rs
@@ -26,7 +26,7 @@ use arrow::datatypes::{
TimestampMicrosecondType, TimestampMillisecondType, TimestampNanosecondType,
TimestampSecondType, UInt16Type, UInt32Type, UInt64Type, UInt8Type,
};
-use rand::distributions::Standard;
+use rand::distr::StandardUniform;
use rand::prelude::Distribution;
use rand::rngs::StdRng;
use rand::Rng;
@@ -41,11 +41,11 @@ macro_rules! basic_random_data {
($ARROW_TYPE: ty) => {
impl RandomNativeData for $ARROW_TYPE
where
- Standard: Distribution<Self::Native>,
+ StandardUniform: Distribution<Self::Native>,
{
#[inline]
fn generate_random_native_data(rng: &mut StdRng) -> Self::Native {
- rng.gen::<Self::Native>()
+ rng.random::<Self::Native>()
}
}
};
@@ -81,7 +81,7 @@ basic_random_data!(DurationNanosecondType);
impl RandomNativeData for Date64Type {
fn generate_random_native_data(rng: &mut StdRng) -> Self::Native {
// TODO: constrain this range to valid dates if necessary
- let date_value = rng.gen_range(i64::MIN..=i64::MAX);
+ let date_value = rng.random_range(i64::MIN..=i64::MAX);
let millis_per_day = 86_400_000;
date_value - (date_value % millis_per_day)
}
@@ -90,8 +90,8 @@ impl RandomNativeData for Date64Type {
impl RandomNativeData for IntervalDayTimeType {
fn generate_random_native_data(rng: &mut StdRng) -> Self::Native {
IntervalDayTime {
- days: rng.gen::<i32>(),
- milliseconds: rng.gen::<i32>(),
+ days: rng.random::<i32>(),
+ milliseconds: rng.random::<i32>(),
}
}
}
@@ -99,9 +99,9 @@ impl RandomNativeData for IntervalDayTimeType {
impl RandomNativeData for IntervalMonthDayNanoType {
fn generate_random_native_data(rng: &mut StdRng) -> Self::Native {
IntervalMonthDayNano {
- months: rng.gen::<i32>(),
- days: rng.gen::<i32>(),
- nanoseconds: rng.gen::<i64>(),
+ months: rng.random::<i32>(),
+ days: rng.random::<i32>(),
+ nanoseconds: rng.random::<i64>(),
}
}
}
@@ -111,12 +111,12 @@ impl RandomNativeData for IntervalMonthDayNanoType {
// https://github.com/apache/arrow-rs/issues/7533
impl RandomNativeData for DurationSecondType {
fn generate_random_native_data(rng: &mut StdRng) -> Self::Native {
- rng.gen::<i64>() / 1000
+ rng.random::<i64>() / 1000
}
}
impl RandomNativeData for Decimal256Type {
fn generate_random_native_data(rng: &mut StdRng) -> Self::Native {
- i256::from_parts(rng.gen::<u128>(), rng.gen::<i128>())
+ i256::from_parts(rng.random::<u128>(), rng.random::<i128>())
}
}
diff --git a/test-utils/src/array_gen/string.rs b/test-utils/src/array_gen/string.rs
index ac659ae67b..546485fd8d 100644
--- a/test-utils/src/array_gen/string.rs
+++ b/test-utils/src/array_gen/string.rs
@@ -18,6 +18,7 @@
use arrow::array::{
ArrayRef, GenericStringArray, OffsetSizeTrait, StringViewArray, UInt32Array,
};
+use rand::distr::StandardUniform;
use rand::rngs::StdRng;
use rand::Rng;
@@ -47,11 +48,11 @@ impl StringArrayGenerator {
// pick num_strings randomly from the distinct string table
let indices: UInt32Array = (0..self.num_strings)
.map(|_| {
- if self.rng.gen::<f64>() < self.null_pct {
+ if self.rng.random::<f64>() < self.null_pct {
None
} else if self.num_distinct_strings > 1 {
let range = 1..(self.num_distinct_strings as u32);
- Some(self.rng.gen_range(range))
+ Some(self.rng.random_range(range))
} else {
Some(0)
}
@@ -71,11 +72,11 @@ impl StringArrayGenerator {
// pick num_strings randomly from the distinct string table
let indices: UInt32Array = (0..self.num_strings)
.map(|_| {
- if self.rng.gen::<f64>() < self.null_pct {
+ if self.rng.random::<f64>() < self.null_pct {
None
} else if self.num_distinct_strings > 1 {
let range = 1..(self.num_distinct_strings as u32);
- Some(self.rng.gen_range(range))
+ Some(self.rng.random_range(range))
} else {
Some(0)
}
@@ -92,10 +93,10 @@ fn random_string(rng: &mut StdRng, max_len: usize) -> String {
// pick characters at random (not just ascii)
match max_len {
0 => "".to_string(),
- 1 => String::from(rng.gen::<char>()),
+ 1 => String::from(rng.random::<char>()),
_ => {
- let len = rng.gen_range(1..=max_len);
- rng.sample_iter::<char, _>(rand::distributions::Standard)
+ let len = rng.random_range(1..=max_len);
+ rng.sample_iter::<char, _>(StandardUniform)
.take(len)
.collect()
}
diff --git a/test-utils/src/data_gen.rs b/test-utils/src/data_gen.rs
index 7ac6f3d3e2..2228010b28 100644
--- a/test-utils/src/data_gen.rs
+++ b/test-utils/src/data_gen.rs
@@ -104,10 +104,11 @@ impl BatchBuilder {
}
fn append(&mut self, rng: &mut StdRng, host: &str, service: &str) {
- let num_pods = rng.gen_range(self.options.pods_per_host.clone());
+ let num_pods = rng.random_range(self.options.pods_per_host.clone());
let pods = generate_sorted_strings(rng, num_pods, 30..40);
for pod in pods {
- let num_containers = rng.gen_range(self.options.containers_per_pod.clone());
+ let num_containers =
+ rng.random_range(self.options.containers_per_pod.clone());
for container_idx in 0..num_containers {
let container = format!("{service}_container_{container_idx}");
let image = format!(
@@ -115,7 +116,7 @@ impl BatchBuilder {
);
let num_entries =
- rng.gen_range(self.options.entries_per_container.clone());
+ rng.random_range(self.options.entries_per_container.clone());
for i in 0..num_entries {
if self.is_finished() {
return;
@@ -154,7 +155,7 @@ impl BatchBuilder {
if self.options.include_nulls {
// Append a null value if the option is set
// Use both "NULL" as a string and a null value
- if rng.gen_bool(0.5) {
+ if rng.random_bool(0.5) {
self.client_addr.append_null();
} else {
self.client_addr.append_value("NULL");
@@ -162,26 +163,26 @@ impl BatchBuilder {
} else {
self.client_addr.append_value(format!(
"{}.{}.{}.{}",
- rng.gen::<u8>(),
- rng.gen::<u8>(),
- rng.gen::<u8>(),
- rng.gen::<u8>()
+ rng.random::<u8>(),
+ rng.random::<u8>(),
+ rng.random::<u8>(),
+ rng.random::<u8>()
));
}
- self.request_duration.append_value(rng.gen());
+ self.request_duration.append_value(rng.random());
self.request_user_agent
.append_value(random_string(rng, 20..100));
self.request_method
- .append_value(methods[rng.gen_range(0..methods.len())]);
+ .append_value(methods[rng.random_range(0..methods.len())]);
self.request_host
.append_value(format!("https://{service}.mydomain.com"));
self.request_bytes
- .append_option(rng.gen_bool(0.9).then(|| rng.gen()));
+ .append_option(rng.random_bool(0.9).then(|| rng.random()));
self.response_bytes
- .append_option(rng.gen_bool(0.9).then(|| rng.gen()));
+ .append_option(rng.random_bool(0.9).then(|| rng.random()));
self.response_status
- .append_value(status[rng.gen_range(0..status.len())]);
+ .append_value(status[rng.random_range(0..status.len())]);
self.prices_status.append_value(self.row_count as i128);
}
@@ -216,9 +217,9 @@ impl BatchBuilder {
}
fn random_string(rng: &mut StdRng, len_range: Range<usize>) -> String {
- let len = rng.gen_range(len_range);
+ let len = rng.random_range(len_range);
(0..len)
- .map(|_| rng.gen_range(b'a'..=b'z') as char)
+ .map(|_| rng.random_range(b'a'..=b'z') as char)
.collect::<String>()
}
@@ -364,7 +365,7 @@ impl Iterator for AccessLogGenerator {
self.host_idx += 1;
for service in &["frontend", "backend", "database", "cache"] {
- if self.rng.gen_bool(0.5) {
+ if self.rng.random_bool(0.5) {
continue;
}
if builder.is_finished() {
diff --git a/test-utils/src/lib.rs b/test-utils/src/lib.rs
index 47f23de495..be2bc0712a 100644
--- a/test-utils/src/lib.rs
+++ b/test-utils/src/lib.rs
@@ -67,9 +67,9 @@ pub fn add_empty_batches(
.flat_map(|batch| {
// insert 0, or 1 empty batches before and after the current batch
let empty_batch = RecordBatch::new_empty(schema.clone());
- std::iter::repeat_n(empty_batch.clone(), rng.gen_range(0..2))
+ std::iter::repeat_n(empty_batch.clone(), rng.random_range(0..2))
.chain(std::iter::once(batch))
- .chain(std::iter::repeat_n(empty_batch, rng.gen_range(0..2)))
+ .chain(std::iter::repeat_n(empty_batch, rng.random_range(0..2)))
})
.collect()
}
@@ -100,7 +100,7 @@ pub fn stagger_batch_with_seed(batch: RecordBatch, seed: u64) -> Vec<RecordBatch
let mut remainder = batch;
while remainder.num_rows() > 0 {
- let batch_size = rng.gen_range(0..remainder.num_rows() + 1);
+ let batch_size = rng.random_range(0..remainder.num_rows() + 1);
batches.push(remainder.slice(0, batch_size));
remainder = remainder.slice(batch_size, remainder.num_rows() - batch_size);
diff --git a/test-utils/src/string_gen.rs b/test-utils/src/string_gen.rs
index b598241db1..75ed03898a 100644
--- a/test-utils/src/string_gen.rs
+++ b/test-utils/src/string_gen.rs
@@ -19,7 +19,7 @@ use crate::array_gen::StringArrayGenerator;
use crate::stagger_batch;
use arrow::record_batch::RecordBatch;
use rand::rngs::StdRng;
-use rand::{thread_rng, Rng, SeedableRng};
+use rand::{rng, Rng, SeedableRng};
/// Randomly generate strings
pub struct StringBatchGenerator(StringArrayGenerator);
@@ -56,18 +56,18 @@ impl StringBatchGenerator {
stagger_batch(batch)
}
- /// Return an set of `BatchGenerator`s that cover a range of interesting
+ /// Return a set of `BatchGenerator`s that cover a range of interesting
/// cases
pub fn interesting_cases() -> Vec<Self> {
let mut cases = vec![];
- let mut rng = thread_rng();
+ let mut rng = rng();
for null_pct in [0.0, 0.01, 0.1, 0.5] {
for _ in 0..10 {
// max length of generated strings
- let max_len = rng.gen_range(1..50);
- let num_strings = rng.gen_range(1..100);
+ let max_len = rng.random_range(1..50);
+ let num_strings = rng.random_range(1..100);
let num_distinct_strings = if num_strings > 1 {
- rng.gen_range(1..num_strings)
+ rng.random_range(1..num_strings)
} else {
num_strings
};
@@ -76,7 +76,7 @@ impl StringBatchGenerator {
num_strings,
num_distinct_strings,
null_pct,
- rng: StdRng::from_seed(rng.gen()),
+ rng: StdRng::from_seed(rng.random()),
}))
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datafusion.apache.org
For additional commands, e-mail: commits-help@datafusion.apache.org