crates: Upgrade dependencies

Cargo.toml

@@ -62,23 +62,188 @@ members = [
 resolver = "2"
 
 [workspace.dependencies]
-clap = "4.3"
+clap = "4.5"
 consulrs = { git = "https://github.com/readysettech/consulrs.git", branch = "allow-disabling-rustls-tls-2" }
 criterion = "0.5"
 eui48 = { git = "https://github.com/readysettech/eui48.git", branch = "master", default-features = false }
+fork = "0.1"
 mysql_async = { git = "https://github.com/readysettech/mysql_async" }
 nperf-core = { git = "https://github.com/readysettech/not-perf.git" }
 postgres = {  git = "https://github.com/readysettech/rust-postgres.git"}
 postgres-native-tls = {  git = "https://github.com/readysettech/rust-postgres.git"}
 postgres-protocol = {  git = "https://github.com/readysettech/rust-postgres.git"}
 postgres-types = {  git = "https://github.com/readysettech/rust-postgres.git"}
 tokio-postgres = {  git = "https://github.com/readysettech/rust-postgres.git"}
-tokio = { version = "1.32",  features = ["full"] }
-tokio-test = { version = "0.4.3" }
+tokio = { version = "1.37",  features = ["full"] }
+tokio-test = { version = "0.4.4" }
 rocksdb = { git = "https://github.com/readysettech/rust-rocksdb.git", default-features = false, features = ["lz4", "jemalloc"] }
 metrics-exporter-prometheus = { git = "https://github.com/readysettech/metrics.git" }
 metrics = { git = "https://github.com/readysettech/metrics.git" }
 metrics-util = { git = "https://github.com/readysettech/metrics.git" }
+ahash = "0.8"
+anyhow = "1.0.82"
+assert_approx_eq = "1.1.0"
+assert_unordered = "0.3"
+async-bincode = "0.6.2"
+async-stream = "0.3.5"
+async-trait = "0.1"
+atomic-counter = "1.0.1"
+backoff = "0.4.0"
+backtrace = "=0.3.65"
+bimap = "0.6.3"
+bincode = "1.3.3"
+bit-vec = "0.6"
+blake2 = "0.10"
+bufstream = "0.1.4"
+byteorder = "1.5.0"
+bytes = "1.6.0"
+chashmap = "2.2.2"
+chrono = "0.4.38"
+chrono-tz = "0.8.6"
+cidr = "0.2.2"
+cloudflare-zlib = "0.2.10"
+console = "0.15.8"
+const-str = "0.5"
+crossbeam-skiplist = "0.1.3"
+csv = "1.3"
+dashmap = "4.0.2"
+deadpool-postgres = "0.10.5"
+derive_builder = "0.11.2"
+derive_more = "0.99.17"
+diff = "0.1.13"
+enum-display-derive = "0.1.1"
+enum-kinds = "0.5.1"
+enum_dispatch = "0.3.13"
+envy = "0.4"
+fail = "0.5.1"
+fallible-iterator = "0.2.0"
+fixedbitset = { version = "0.2.0", default-features = false }
+futures = "0.3.30"
+futures-core = "0.3.30"
+futures-executor = "0.3.30"
+futures-sink = "0.3.30"
+futures-util = "0.3.30"
+fxhash = "0.2.1"
+getrandom = "0.2.14"
+growable-bloom-filter = "2.1.0"
+hashbag = "0.1.12"
+hdrhistogram = "7.5"
+hex = "0.4.3"
+hmac = "0.12.1"
+humantime = "2.1"
+hyper = "0.14.28"
+include_dir = "0.6.2"
+indexmap = { version = "1.9.3", default-features = false }
+indicatif = "0.17"
+indoc = "1.0.9"
+iter-enum = "1.1.3"
+itertools = "0.10.5"
+lazy_static = "1.4.0"
+left-right = "0.11"
+libc = "0.2"
+lru = "0.12.3"
+machine-uid = "0.2"
+md5 = "0.7.0"
+mysql = "25"
+mysql_common = "0.32"
+native-tls = "0.2.11"
+ndarray = "0.15.6"
+nom = "7.1.3"
+nom_locate = "4.2.0"
+notify = "6.1.1"
+num-integer = "0.1.46"
+num_cpus = "1.16.0"
+opentelemetry = "0.21.0"
+opentelemetry-otlp = "0.14.0"
+opentelemetry-semantic-conventions = "0.13"
+opentelemetry_sdk = "0.21.2"
+parking_lot = "0.12.1"
+paste = "1.0.14"
+petgraph = "0.5"
+pin-project = "1.1"
+pprof = "0.13"
+pratt = "0.3.0"
+pretty_assertions = "1.4.0"
+prettytable = "0.10.0"
+proc-macro2 = "1"
+prometheus-parse = "0.2.5"
+proptest = "1.4.0"
+quanta = { version = "0.11", default-features = false }
+querystring = "1.1.0"
+quote = "1.0.36"
+rand = "0.8.5"
+rand_distr = "0.4"
+rand_regex = "0.15.1"
+redis = "0.23.3"
+regex = "1.10.4"
+reqwest = "0.11.27"
+rlimit = "0.10.1"
+rmp-serde = "1.2.0"
+rust_decimal = "1.26"
+rusty-fork = "0.3.0"
+rustyline = "11.0"
+rustyline-derive = "0.6.0"
+scopeguard = "1.2.0"
+serde = "1.0.198"
+serde_bytes = "0.11"
+serde_derive = "1.0.198"
+serde_json = "1.0.116"
+serde_stacker = "0.1.11"
+serde_with = "1.14"
+serde_with_macros = "2.3.3"
+serde_yaml = "0.8"
+serial_test = "0.5.1"
+sha-1 = "0.10.1"
+sha1 = "0.10"
+sha2 = "0.10.8"
+slab = "0.4.9"
+slotmap = "1.0.7"
+smallvec = { version = "1.13.2", default-features = false }
+socket2 = "0.4"
+sqlformat = "0.2.3"
+sqlparser = "0.41.0"
+strawpoll = "0.2.3"
+streaming-iterator = "0.1"
+stringprep = "0.1.4"
+structopt = "0.2"
+strum = "0.23"
+strum_macros = "0.23"
+syn = { version = "1.0.109", default-features = false }
+temp-dir = "0.1"
+tempfile = "3.10.1"
+test-strategy = "0.2.1"
+textwrap = "0.14"
+thiserror = "1.0.59"
+tikv-jemalloc-ctl = "0.5.4"
+tikv-jemalloc-sys = "0.5.4"
+tikv-jemallocator = "0.5.4"
+time = "0.3"
+timekeeper = { version = "0.3.2", default-features = false }
+tokio-native-tls = "0.3.1"
+tokio-retry = "0.3"
+tokio-scoped = "0.2.0"
+tokio-stream = "0.1.15"
+tokio-tower = "0.5.1"
+tokio-util = "0.6.10"
+toml = "0.5"
+tower = "0.4.13"
+tower-layer = "0.3.2"
+tower-service = "0.3.2"
+tracing = "0.1.40"
+tracing-appender = "0.2.3"
+tracing-attributes = "0.1.27"
+tracing-futures = "0.2.5"
+tracing-opentelemetry = "0.22.0"
+tracing-subscriber = "0.3.18"
+triomphe = "0.1"
+tuple = "0.5.2"
+url = "2.5.0"
+uuid = "0.8"
+vec1 = "1.12.0"
+vec_map = "0.8.2"
+vmemcached = "0.5.0"
+walkdir = "2.5.0"
+zipf = "7.0.1"
 
 [profile.release]
 debug=true

array2/Cargo.toml

@@ -6,5 +6,5 @@ authors = ["ReadySet Technology, Inc. <info@readyset.io>"]
 edition = "2021"
 
 [dependencies]
-serde = { version = "1.0.137", features = ["derive"] }
-thiserror = "1.0.31"
+serde = { workspace = true, features = ["derive"] }
+thiserror = { workspace = true }

array2/src/lib.rs

@@ -20,11 +20,9 @@
 //! Internally, values are stored in a single continuous allocation row-first, alongside the length
 //! of the row.
 
-#![feature(core_intrinsics, int_roundings)]
+#![feature(int_roundings)]
 use std::fmt::Debug;
-use std::intrinsics::unlikely;
 use std::ops::{Index, IndexMut};
-use std::usize;
 
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
@@ -85,11 +83,16 @@ impl<T> Array2<T> {
     /// passed an empty vector or if the rows are a different size.
     #[inline]
     pub fn try_from_rows(rows: Vec<Vec<T>>) -> Result<Self> {
+        #[cold]
+        fn not_equal(x: usize, y: usize) -> bool {
+            x != y
+        }
+
         let row_size = rows.first().ok_or(Error::Empty)?.len();
         let mut elems = Vec::with_capacity(row_size * rows.len());
 
         for (row_index, row) in rows.into_iter().enumerate() {
-            if unlikely(row.len() != row_size) {
+            if not_equal(row.len(), row_size) {
                 return Err(Error::InconsistentRowSize {
                     row_index,
                     row_size,
@@ -199,9 +202,7 @@ impl<T> Array2<T> {
     /// );
     /// ```
     #[inline]
-    pub fn rows(
-        &self,
-    ) -> impl Iterator<Item = &[T]> + ExactSizeIterator + DoubleEndedIterator + '_ {
+    pub fn rows(&self) -> impl ExactSizeIterator<Item = &[T]> + DoubleEndedIterator + '_ {
         self.cells.chunks(self.row_size)
     }
 
@@ -220,7 +221,7 @@ impl<T> Array2<T> {
     /// )
     /// ```
     #[inline]
-    pub fn entries(&self) -> impl Iterator<Item = ((usize, usize), &T)> + ExactSizeIterator + '_ {
+    pub fn entries(&self) -> impl ExactSizeIterator<Item = ((usize, usize), &T)> + '_ {
         self.cells.iter().enumerate().map(move |(i, v)| {
             let row = i.div_floor(self.row_size);
             let col = i % self.row_size;
@@ -243,9 +244,7 @@ impl<T> Array2<T> {
     /// assert_eq!(my_array2, Array2::from_rows(vec![vec![1, 3], vec![4, 6]]))
     /// ```
     #[inline]
-    pub fn entries_mut(
-        &mut self,
-    ) -> impl Iterator<Item = ((usize, usize), &mut T)> + ExactSizeIterator + '_ {
+    pub fn entries_mut(&mut self) -> impl ExactSizeIterator<Item = ((usize, usize), &mut T)> + '_ {
         let row_size = self.row_size;
         self.cells.iter_mut().enumerate().map(move |(i, v)| {
             let row = i.div_floor(row_size);
@@ -270,7 +269,7 @@ impl<T> Array2<T> {
     /// )
     /// ```
     #[inline]
-    pub fn into_entries(self) -> impl Iterator<Item = ((usize, usize), T)> + ExactSizeIterator {
+    pub fn into_entries(self) -> impl ExactSizeIterator<Item = ((usize, usize), T)> {
         self.cells
             .into_vec()
             .into_iter()

benchmarks/Cargo.toml

@@ -6,45 +6,45 @@ authors = ["ReadySet Technology, Inc. <info@readyset.io>"]
 edition = "2021"
 
 [dependencies]
-crossbeam-skiplist = "0.1.1"
+crossbeam-skiplist = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
-anyhow = "1.0.38"
-csv = "1.2"
-nom = "7.1"
-nom_locate = "4.0.0"
-rand = "0.8.3"
-rand_distr = "0.4"
-tracing = "0.1.29"
-async-trait = "0.1"
-enum_dispatch = "0.3.7"
-futures = "0.3"
-vec1 = "1.8.0"
-url = "2.2.2"
-hdrhistogram = "7.4"
-zipf = "7.0.0"
+anyhow = { workspace = true }
+csv = { workspace = true }
+nom = { workspace = true }
+nom_locate = { workspace = true }
+rand = { workspace = true }
+rand_distr = { workspace = true }
+tracing = { workspace = true }
+async-trait = { workspace = true }
+enum_dispatch = { workspace = true }
+futures = { workspace = true }
+vec1 = { workspace = true }
+url = { workspace = true }
+hdrhistogram = { workspace = true }
+zipf = { workspace = true }
 clap = { workspace = true, features = ["derive", "env"] }
-reqwest = { version = "0.11.20", features = ["stream", "native-tls"] }
-chrono = "0.4"
-atomic-counter = "1.0.1"
-serde_json = "1.0"
-serde_yaml = "0.8"
-serde = "1.0"
-serde_with = "1.12"
+reqwest = { workspace = true, features = ["stream", "native-tls"] }
+chrono = { workspace = true }
+atomic-counter = { workspace = true }
+serde_json = { workspace = true }
+serde_yaml = { workspace = true }
+serde = { workspace = true }
+serde_with = { workspace = true }
 metrics = { workspace = true }
 metrics-util = { workspace = true }
 metrics-exporter-prometheus = { workspace = true }
-itertools = "0.10"
-num-integer = "0.1.44"
-lazy_static = "1.4.0"
-thiserror = "1.0.30"
-async-stream = "0.3.2"
-parking_lot = "0.11.2"
-indicatif = "0.17"
-prometheus-parse = "0.2.2"
-walkdir = "2.3"
+itertools = { workspace = true }
+num-integer = { workspace = true }
+lazy_static = { workspace = true }
+thiserror = { workspace = true }
+async-stream = { workspace = true }
+parking_lot = { workspace = true }
+indicatif = { workspace = true }
+prometheus-parse = { workspace = true }
+walkdir = { workspace = true }
 tokio-postgres = { workspace = true }
-vmemcached = "0.5.0"
-redis = { version = "0.23.3", features = ["tokio-comp", "aio"] }
+vmemcached = { workspace = true }
+redis = { workspace = true, features = ["tokio-comp", "aio"] }
 
 # local dependencies
 database-utils = { path = "../database-utils" }
@@ -96,8 +96,8 @@ path = "src/bin/snapshot_time.rs"
 [features]
 
 [dev-dependencies]
-indoc = "1.0.3"
-itertools = "0.10"
-proptest = "1.0.0"
-test-strategy = "0.2.0"
-url = "2.2.2"
+indoc = { workspace = true }
+itertools = { workspace = true }
+proptest = { workspace = true }
+test-strategy = { workspace = true }
+url = { workspace = true }

benchmarks/src/benchmark.rs

@@ -14,7 +14,6 @@ use std::collections::HashMap;
 use std::str::FromStr;
 
 use anyhow::Result;
-use async_trait::async_trait;
 use clap::Parser;
 use database_utils::{DatabaseConnection, DatabaseType, DatabaseURL};
 use enum_dispatch::enum_dispatch;
@@ -265,7 +264,8 @@ impl BenchmarkOutput {
 
 /// The set of control functions needed to execute the benchmark in
 /// the `BenchmarkRunner`.
-#[async_trait]
+// Only used internally
+#[allow(async_fn_in_trait)]
 #[enum_dispatch]
 pub trait BenchmarkControl {
     /// Any code required to perform setup of the benchmark goes here. This

benchmarks/src/cache_hit_benchmark.rs

@@ -4,7 +4,6 @@ use std::str::FromStr;
 use std::time::Instant;
 
 use anyhow::Result;
-use async_trait::async_trait;
 use clap::Parser;
 use database_utils::{DatabaseConnection, DatabaseURL, QueryableConnection};
 use metrics::Unit;
@@ -36,7 +35,6 @@ pub struct CacheHitBenchmark {
     num_cache_misses: u32,
 }
 
-#[async_trait]
 impl BenchmarkControl for CacheHitBenchmark {
     async fn setup(&self, deployment: &DeploymentParameters) -> Result<()> {
         self.data_generator