From 3875bc91ab26251a78c9e1fd71a0cf95acbf83f3 Mon Sep 17 00:00:00 2001 From: Trent Nelson Date: Fri, 11 Mar 2022 01:12:46 -0700 Subject: [PATCH] Revert "chore: bump dashmap from 4.0.2 to 5.1.0 (#23372) (#23521)" (#23596) This reverts commit f56b25ac29a1ce00ff6f85839c34e014f9addf88. --- Cargo.lock | 91 +++++------------------------------- core/Cargo.toml | 2 +- gossip/Cargo.toml | 2 +- ledger-tool/Cargo.toml | 2 +- ledger/Cargo.toml | 2 +- programs/bpf/Cargo.lock | 85 ++++----------------------------- rayon-threadlimit/Cargo.toml | 2 +- rpc/Cargo.toml | 2 +- runtime/Cargo.toml | 4 +- sdk/program/Cargo.toml | 2 +- validator/Cargo.toml | 2 +- 11 files changed, 31 insertions(+), 165 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7f9f18d910..36a872fdac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1032,13 +1032,12 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.1.0" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0834a35a3fce649144119e18da2a4d8ed12ef3862f47183fd46f625d072d96c" +checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" dependencies = [ "cfg-if 1.0.0", "num_cpus", - "parking_lot 0.12.0", "rayon", ] @@ -1400,7 +1399,7 @@ checksum = "cfc110fe50727d46a428eed832df40affe9bf74d077cac1bf3f2718e823f14c5" dependencies = [ "cfg-if 1.0.0", "libc", - "windows-sys 0.28.0", + "windows-sys", ] [[package]] @@ -2415,9 +2414,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.6" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" +checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" dependencies = [ "scopeguard", ] @@ -2919,20 +2918,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", - "lock_api 0.4.6", + "lock_api 0.4.5", "parking_lot_core 0.8.5", ] -[[package]] -name = "parking_lot" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" -dependencies = [ - "lock_api 0.4.6", - "parking_lot_core 0.9.1", -] - [[package]] name = "parking_lot_core" version = "0.6.2" @@ -2962,19 +2951,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "parking_lot_core" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.2.10", - "smallvec 1.7.0", - "windows-sys 0.32.0", -] - [[package]] name = "pbkdf2" version = "0.4.0" @@ -5500,7 +5476,7 @@ dependencies = [ "log 0.4.14", "num-derive", "num-traits", - "parking_lot 0.12.0", + "parking_lot 0.11.2", "rand 0.7.3", "rustc_version 0.4.0", "rustversion", @@ -7529,24 +7505,11 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82ca39602d5cbfa692c4b67e3bcbb2751477355141c1ed434c94da4186836ff6" dependencies = [ - "windows_aarch64_msvc 0.28.0", - "windows_i686_gnu 0.28.0", - "windows_i686_msvc 0.28.0", - "windows_x86_64_gnu 0.28.0", - "windows_x86_64_msvc 0.28.0", -] - -[[package]] -name = "windows-sys" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" -dependencies = [ - "windows_aarch64_msvc 0.32.0", - "windows_i686_gnu 0.32.0", - "windows_i686_msvc 0.32.0", - "windows_x86_64_gnu 0.32.0", - "windows_x86_64_msvc 0.32.0", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", ] [[package]] @@ -7555,60 +7518,30 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52695a41e536859d5308cc613b4a022261a274390b25bd29dfff4bf08505f3c2" -[[package]] -name = "windows_aarch64_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" - [[package]] name = "windows_i686_gnu" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f54725ac23affef038fecb177de6c9bf065787c2f432f79e3c373da92f3e1d8a" -[[package]] -name = "windows_i686_gnu" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" - [[package]] name = "windows_i686_msvc" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d5158a43cc43623c0729d1ad6647e62fa384a3d135fd15108d37c683461f64" -[[package]] -name = "windows_i686_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" - [[package]] name = "windows_x86_64_gnu" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc31f409f565611535130cfe7ee8e6655d3fa99c1c61013981e491921b5ce954" -[[package]] -name = "windows_x86_64_gnu" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" - [[package]] name = "windows_x86_64_msvc" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f2b8c7cbd3bfdddd9ab98769f9746a7fad1bca236554cd032b78d768bc0e89f" -[[package]] -name = "windows_x86_64_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" - [[package]] name = "winreg" version = "0.7.0" diff --git a/core/Cargo.toml b/core/Cargo.toml index be0a79bd73..d04501a51d 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -20,7 +20,7 @@ bincode = "1.3.3" bs58 = "0.4.0" chrono = { version = "0.4.11", features = ["serde"] } crossbeam-channel = "0.5" -dashmap = { version = "5.1.0", features = ["rayon", "raw-api"] } +dashmap = { version = "4.0.2", features = ["rayon", "raw-api"] } etcd-client = { version = "0.8.1", features = ["tls"]} fs_extra = "1.2.0" histogram = "0.6.9" diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml index 479c9f0b84..6b81a9e5d5 100644 --- a/gossip/Cargo.toml +++ b/gossip/Cargo.toml @@ -47,7 +47,7 @@ solana-vote-program = { path = "../programs/vote", version = "=1.9.12" } thiserror = "1.0" [dev-dependencies] -num_cpus = "1.13.1" +num_cpus = "1.13.0" serial_test = "0.5.1" [build-dependencies] diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml index 38f2137d01..6188116428 100644 --- a/ledger-tool/Cargo.toml +++ b/ledger-tool/Cargo.toml @@ -14,7 +14,7 @@ bs58 = "0.4.0" bytecount = "0.6.2" clap = "2.33.1" csv = "1.1.6" -dashmap = "5.1.0" +dashmap = "4.0.2" histogram = "*" itertools = "0.10.1" log = { version = "0.4.14" } diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml index 1ba56df9c8..e05d0e9453 100644 --- a/ledger/Cargo.toml +++ b/ledger/Cargo.toml @@ -23,7 +23,7 @@ libc = "0.2.108" log = { version = "0.4.14" } num-derive = "0.3" num-traits = "0.2" -num_cpus = "1.13.1" +num_cpus = "1.13.0" prost = "0.9.0" rand = "0.7.0" rand_chacha = "0.2.2" diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index 7af76fe688..b530f46487 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -585,13 +585,12 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.1.0" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0834a35a3fce649144119e18da2a4d8ed12ef3862f47183fd46f625d072d96c" +checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" dependencies = [ "cfg-if 1.0.0", "num_cpus", - "parking_lot 0.12.0", "rayon", ] @@ -1422,9 +1421,9 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" [[package]] name = "lock_api" -version = "0.4.6" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" +checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" dependencies = [ "scopeguard", ] @@ -1687,17 +1686,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core 0.8.5", -] - -[[package]] -name = "parking_lot" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.1", + "parking_lot_core", ] [[package]] @@ -1714,19 +1703,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "parking_lot_core" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "smallvec", - "windows-sys", -] - [[package]] name = "pbkdf2" version = "0.4.0" @@ -3138,7 +3114,7 @@ dependencies = [ "log", "num-derive", "num-traits", - "parking_lot 0.11.2", + "parking_lot", "rand 0.7.3", "rustc_version", "rustversion", @@ -3179,7 +3155,7 @@ dependencies = [ "log", "num-derive", "num-traits", - "parking_lot 0.12.0", + "parking_lot", "rand 0.7.3", "rustc_version", "rustversion", @@ -3259,7 +3235,7 @@ dependencies = [ "log", "num-derive", "num-traits", - "parking_lot 0.11.2", + "parking_lot", "qstring", "semver", "solana-sdk", @@ -3778,7 +3754,7 @@ dependencies = [ "mio", "num_cpus", "once_cell", - "parking_lot 0.11.2", + "parking_lot", "pin-project-lite", "signal-hook-registry", "tokio-macros", @@ -4207,49 +4183,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-sys" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" -dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" - -[[package]] -name = "windows_i686_gnu" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" - -[[package]] -name = "windows_i686_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" - [[package]] name = "winreg" version = "0.7.0" diff --git a/rayon-threadlimit/Cargo.toml b/rayon-threadlimit/Cargo.toml index 602b21aac8..f270821020 100644 --- a/rayon-threadlimit/Cargo.toml +++ b/rayon-threadlimit/Cargo.toml @@ -11,7 +11,7 @@ license = "Apache-2.0" edition = "2021" [dependencies] -num_cpus = "1.13.1" +num_cpus = "1.13.0" lazy_static = "1.4.0" [package.metadata.docs.rs] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index f114bc7015..4024f56084 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -14,7 +14,7 @@ base64 = "0.12.3" bincode = "1.3.3" bs58 = "0.4.0" crossbeam-channel = "0.5" -dashmap = "5.1.0" +dashmap = "4.0.2" itertools = "0.10.1" jsonrpc-core = "18.0.0" jsonrpc-core-client = { version = "18.0.0", features = ["ipc", "ws"] } diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 6e6dd1d935..d7d3fc602a 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -17,7 +17,7 @@ bv = { version = "0.11.1", features = ["serde"] } bytemuck = "1.7.2" byteorder = "1.4.3" bzip2 = "0.4.3" -dashmap = { version = "5.1.0", features = ["rayon", "raw-api"] } +dashmap = { version = "4.0.2", features = ["rayon", "raw-api"] } crossbeam-channel = "0.5" dir-diff = "0.3.2" flate2 = "1.0.22" @@ -27,7 +27,7 @@ itertools = "0.10.1" lazy_static = "1.4.0" log = "0.4.14" memmap2 = "0.5.0" -num_cpus = "1.13.1" +num_cpus = "1.13.0" num-derive = { version = "0.3" } num-traits = { version = "0.2" } ouroboros = "0.13.0" diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml index e1037a3631..e6cd70a870 100644 --- a/sdk/program/Cargo.toml +++ b/sdk/program/Cargo.toml @@ -51,7 +51,7 @@ js-sys = "0.3.55" getrandom = { version = "0.1", features = ["wasm-bindgen"] } [target.'cfg(not(target_pointer_width = "64"))'.dependencies] -parking_lot = "0.12" +parking_lot = "0.11" [dev-dependencies] anyhow = "1.0.45" diff --git a/validator/Cargo.toml b/validator/Cargo.toml index 41e74a6167..87f4e1033b 100644 --- a/validator/Cargo.toml +++ b/validator/Cargo.toml @@ -23,7 +23,7 @@ jsonrpc-derive = "18.0.0" jsonrpc-ipc-server = "18.0.0" jsonrpc-server-utils= "18.0.0" log = "0.4.14" -num_cpus = "1.13.1" +num_cpus = "1.13.0" rand = "0.7.0" solana-clap-utils = { path = "../clap-utils", version = "=1.9.12" } solana-cli-config = { path = "../cli-config", version = "=1.9.12" }