Skip to content

Commit d1638d5

Browse files
committed
treewide: Upgrade dependencies
This commit upgrades many of our dependencies to newer versions. Note that this was not just the result of a `cargo update` invocation; I used the `cargo-edit` tool to automate the process of upgrading crate versions in our Cargo.toml (I also ran `cargo update` afterwards for good measure). The code changes in this commit reflect breaking API changes in the new package versions. Change-Id: Ib15333b66c6bba2e3eb4a302ea85c3a03ab0acf5 Reviewed-on: https://gerrit.readyset.name/c/readyset/+/7378 Tested-by: Buildkite CI Reviewed-by: Jason Brown <[email protected]>
1 parent ecebda8 commit d1638d5

File tree

11 files changed

+1193
-1104
lines changed

11 files changed

+1193
-1104
lines changed

Cargo.lock

+1,062-993
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+82-82
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ members = [
6262
resolver = "2"
6363

6464
[workspace.dependencies]
65-
clap = "4.3"
65+
clap = "4.5"
6666
consulrs = { git = "https://github.com/readysettech/consulrs.git", branch = "allow-disabling-rustls-tls-2" }
6767
criterion = "0.5"
6868
eui48 = { git = "https://github.com/readysettech/eui48.git", branch = "master", default-features = false }
@@ -74,18 +74,18 @@ postgres-native-tls = { git = "https://github.com/readysettech/rust-postgres.gi
7474
postgres-protocol = { git = "https://github.com/readysettech/rust-postgres.git"}
7575
postgres-types = { git = "https://github.com/readysettech/rust-postgres.git"}
7676
tokio-postgres = { git = "https://github.com/readysettech/rust-postgres.git"}
77-
tokio = { version = "1.32", features = ["full"] }
78-
tokio-test = { version = "0.4.3" }
77+
tokio = { version = "1.37", features = ["full"] }
78+
tokio-test = { version = "0.4.4" }
7979
rocksdb = { git = "https://github.com/readysettech/rust-rocksdb.git", default-features = false, features = ["lz4", "jemalloc"] }
8080
metrics-exporter-prometheus = { git = "https://github.com/readysettech/metrics.git" }
8181
metrics = { git = "https://github.com/readysettech/metrics.git" }
8282
metrics-util = { git = "https://github.com/readysettech/metrics.git" }
8383
ahash = "0.7"
84-
anyhow = "1.0.42"
84+
anyhow = "1.0.82"
8585
assert_approx_eq = "1.1.0"
8686
assert_unordered = "0.3"
87-
async-bincode = "0.6.1"
88-
async-stream = "0.3.2"
87+
async-bincode = "0.6.2"
88+
async-stream = "0.3.5"
8989
async-trait = "0.1"
9090
atomic-counter = "1.0.1"
9191
backoff = "0.4.0"
@@ -94,157 +94,157 @@ bimap = "0.6.3"
9494
bincode = "1.3.3"
9595
bit-vec = "0.6"
9696
blake2 = "0.10"
97-
bufstream = "0.1.3"
98-
byteorder = "1.0.0"
99-
bytes = "1.0.1"
100-
chashmap = "2.1.0"
101-
chrono = "0.4.19"
97+
bufstream = "0.1.4"
98+
byteorder = "1.5.0"
99+
bytes = "1.6.0"
100+
chashmap = "2.2.2"
101+
chrono = "0.4.38"
102102
chrono-tz = "0.8.6"
103-
cidr = "0.2.1"
104-
cloudflare-zlib = "0.2.9"
105-
console = "0.15.5"
103+
cidr = "0.2.2"
104+
cloudflare-zlib = "0.2.10"
105+
console = "0.15.8"
106106
const-str = "0.5"
107-
crossbeam-skiplist = "0.1.1"
108-
csv = "1.2"
107+
crossbeam-skiplist = "0.1.3"
108+
csv = "1.3"
109109
dashmap = "4.0.2"
110-
deadpool-postgres = "0.10.3"
110+
deadpool-postgres = "0.10.5"
111111
derive_builder = "0.11.2"
112112
derive_more = "0.99.17"
113-
diff = "0.1.10"
113+
diff = "0.1.13"
114114
enum-display-derive = "0.1.1"
115115
enum-kinds = "0.5.1"
116116
enum_dispatch = "0.3.13"
117117
envy = "0.4"
118-
fail = "0.5.0"
118+
fail = "0.5.1"
119119
fallible-iterator = "0.2.0"
120120
fixedbitset = { version = "0.2.0", default-features = false }
121-
futures = "0.3.21"
122-
futures-core = "0.3.14"
123-
futures-executor = "0.3.14"
124-
futures-sink = "0.3.14"
125-
futures-util = "0.3.14"
121+
futures = "0.3.30"
122+
futures-core = "0.3.30"
123+
futures-executor = "0.3.30"
124+
futures-sink = "0.3.30"
125+
futures-util = "0.3.30"
126126
fxhash = "0.2.1"
127-
getrandom = "0.2.2"
128-
growable-bloom-filter = "2.0.1"
129-
hashbag = "0.1.2"
130-
hdrhistogram = "7.4"
127+
getrandom = "0.2.14"
128+
growable-bloom-filter = "2.1.0"
129+
hashbag = "0.1.12"
130+
hdrhistogram = "7.5"
131131
hex = "0.4.3"
132132
hmac = "0.12.1"
133133
humantime = "2.1"
134-
hyper = "0.14.10"
134+
hyper = "0.14.28"
135135
include_dir = "0.6.2"
136-
indexmap = { version = "1.9.2", default-features = false }
136+
indexmap = { version = "1.9.3", default-features = false }
137137
indicatif = "0.17"
138-
indoc = "1.0.3"
139-
iter-enum = "1.1.1"
140-
itertools = "0.10.4"
138+
indoc = "1.0.9"
139+
iter-enum = "1.1.3"
140+
itertools = "0.10.5"
141141
lazy_static = "1.4.0"
142142
left-right = "0.11"
143143
libc = "0.2"
144-
lru = "0.12.0"
144+
lru = "0.12.3"
145145
machine-uid = "0.2"
146146
md5 = "0.7.0"
147147
mysql = "25"
148148
mysql_common = "0.32"
149-
native-tls = "0.2.8"
150-
ndarray = "0.15.4"
151-
nom = "7.1.1"
152-
nom_locate = "4.0.0"
149+
native-tls = "0.2.11"
150+
ndarray = "0.15.6"
151+
nom = "7.1.3"
152+
nom_locate = "4.2.0"
153153
notify = "6.1.1"
154-
num-integer = "0.1.44"
154+
num-integer = "0.1.46"
155155
num_cpus = "1.16.0"
156156
opentelemetry = "0.21.0"
157157
opentelemetry-otlp = "0.14.0"
158158
opentelemetry-semantic-conventions = "0.13"
159159
opentelemetry_sdk = "0.21.2"
160-
parking_lot = "0.12.0"
161-
paste = "1.0.5"
160+
parking_lot = "0.12.1"
161+
paste = "1.0.14"
162162
petgraph = "0.5"
163-
pin-project = "1.0"
163+
pin-project = "1.1"
164164
pprof = "0.13"
165165
pratt = "0.3.0"
166166
pretty_assertions = "1.4.0"
167167
prettytable = "0.10.0"
168168
proc-macro2 = "1"
169-
prometheus-parse = "0.2.2"
170-
proptest = "1.0.0"
169+
prometheus-parse = "0.2.5"
170+
proptest = "1.4.0"
171171
quanta = { version = "0.11", default-features = false }
172172
querystring = "1.1.0"
173-
quote = "1.0.8"
173+
quote = "1.0.36"
174174
rand = "0.8.5"
175175
rand_distr = "0.4"
176176
rand_regex = "0.15.1"
177177
redis = "0.23.3"
178-
regex = "1.8.4"
179-
reqwest = "0.11.20"
178+
regex = "1.10.4"
179+
reqwest = "0.11.27"
180180
rlimit = "0.10.1"
181-
rmp-serde = "1.1.2"
181+
rmp-serde = "1.2.0"
182182
rust_decimal = "1.26"
183183
rusty-fork = "0.3.0"
184184
rustyline = "11.0"
185185
rustyline-derive = "0.6.0"
186-
scopeguard = "1.1.0"
187-
serde = "1.0.137"
186+
scopeguard = "1.2.0"
187+
serde = "1.0.198"
188188
serde_bytes = "0.11"
189-
serde_derive = "1.0.8"
190-
serde_json = "1.0.89"
191-
serde_stacker = "0.1.7"
192-
serde_with = "1.12"
193-
serde_with_macros = "2.0.0"
189+
serde_derive = "1.0.198"
190+
serde_json = "1.0.116"
191+
serde_stacker = "0.1.11"
192+
serde_with = "1.14"
193+
serde_with_macros = "2.3.3"
194194
serde_yaml = "0.8"
195195
serial_test = "0.5.1"
196-
sha-1 = "0.10.0"
196+
sha-1 = "0.10.1"
197197
sha1 = "0.10"
198-
sha2 = "0.10.6"
199-
slab = "0.4.2"
200-
slotmap = "1.0.6"
201-
smallvec = { version = "1.9.0", default-features = false }
198+
sha2 = "0.10.8"
199+
slab = "0.4.9"
200+
slotmap = "1.0.7"
201+
smallvec = { version = "1.13.2", default-features = false }
202202
socket2 = "0.4"
203-
sqlformat = "0.2.1"
203+
sqlformat = "0.2.3"
204204
sqlparser = "0.41.0"
205-
strawpoll = "0.2.2"
205+
strawpoll = "0.2.3"
206206
streaming-iterator = "0.1"
207-
stringprep = "0.1.2"
207+
stringprep = "0.1.4"
208208
structopt = "0.2"
209209
strum = "0.23"
210210
strum_macros = "0.23"
211-
syn = { version = "1.0.57", default-features = false }
211+
syn = { version = "1.0.109", default-features = false }
212212
temp-dir = "0.1"
213-
tempfile = "3.8.1"
214-
test-strategy = "0.2.0"
213+
tempfile = "3.10.1"
214+
test-strategy = "0.2.1"
215215
textwrap = "0.14"
216-
thiserror = "1.0.31"
217-
tikv-jemalloc-ctl = "0.5.0"
218-
tikv-jemalloc-sys = "0.5.0"
219-
tikv-jemallocator = "0.5.0"
216+
thiserror = "1.0.59"
217+
tikv-jemalloc-ctl = "0.5.4"
218+
tikv-jemalloc-sys = "0.5.4"
219+
tikv-jemallocator = "0.5.4"
220220
time = "0.3"
221221
timekeeper = { version = "0.3.2", default-features = false }
222222
tokio-native-tls = "0.3.1"
223223
tokio-retry = "0.3"
224224
tokio-scoped = "0.2.0"
225-
tokio-stream = "0.1.5"
225+
tokio-stream = "0.1.15"
226226
tokio-tower = "0.5.1"
227-
tokio-util = "0.6.6"
227+
tokio-util = "0.6.10"
228228
toml = "0.5"
229-
tower = "0.4.6"
230-
tower-layer = "0.3.1"
231-
tower-service = "0.3.1"
229+
tower = "0.4.13"
230+
tower-layer = "0.3.2"
231+
tower-service = "0.3.2"
232232
tracing = "0.1.40"
233233
tracing-appender = "0.2.3"
234234
tracing-attributes = "0.1.27"
235235
tracing-futures = "0.2.5"
236236
tracing-opentelemetry = "0.22.0"
237-
tracing-subscriber = "0.3.9"
237+
tracing-subscriber = "0.3.18"
238238
triomphe = "0.1"
239-
tuple = "0.5.1"
240-
url = "2.2.2"
239+
tuple = "0.5.2"
240+
url = "2.5.0"
241241
uuid = "0.8"
242-
vec1 = "1.8.0"
243-
vec_map = "0.8.0"
242+
vec1 = "1.12.0"
243+
vec_map = "0.8.2"
244244
vmemcached = "0.5.0"
245-
walkdir = "2.3.2"
245+
walkdir = "2.5.0"
246246
xxhash-rust = { version = "0.8.10", features = ["xxh3"] }
247-
zipf = "7.0.0"
247+
zipf = "7.0.1"
248248

249249
[profile.release]
250250
debug=true

proptest-stateful/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ edition = "2021"
1818
# versions here to ensure that the crate is usable outside of the context of
1919
# our repo.
2020
async-trait = "0.1"
21-
proptest = "1.0.0"
21+
proptest = "1.4.0"
2222
rand = "0.8.5"
23-
tokio = { version = "1.32", features = ["full"] }
23+
tokio = { version = "1.37", features = ["full"] }
2424

psql-srv/src/codec/decoder.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1183,7 +1183,9 @@ mod tests {
11831183

11841184
#[test]
11851185
fn test_decode_binary_timestamp() {
1186-
let dt = NaiveDateTime::from_timestamp_opt(1_000_000_000, 42_000_000).unwrap();
1186+
let dt = DateTime::from_timestamp(1_000_000_000, 42_000_000)
1187+
.unwrap()
1188+
.naive_utc();
11871189
let mut buf = BytesMut::new();
11881190
buf.put_i32(8); // size
11891191
dt.to_sql(&Type::TIMESTAMP, &mut buf).unwrap(); // value

psql-srv/src/codec/encoder.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ mod tests {
701701

702702
use bit_vec::BitVec;
703703
use bytes::{BufMut, BytesMut};
704-
use chrono::{FixedOffset, NaiveDate, NaiveDateTime, NaiveTime, TimeZone};
704+
use chrono::{DateTime, FixedOffset, NaiveDate, NaiveDateTime, NaiveTime, TimeZone};
705705
use eui48::MacAddress;
706706
use postgres::SimpleQueryRow;
707707
use postgres_protocol::message::backend::DataRowBody;
@@ -1403,7 +1403,9 @@ mod tests {
14031403

14041404
#[test]
14051405
fn test_encode_binary_timestamp() {
1406-
let dt = NaiveDateTime::from_timestamp_opt(1_000_000_000, 42_000_000).unwrap();
1406+
let dt = DateTime::from_timestamp(1_000_000_000, 42_000_000)
1407+
.unwrap()
1408+
.naive_utc();
14071409
let mut buf = BytesMut::new();
14081410
put_binary_value(PsqlValue::Timestamp(dt), &mut buf).unwrap();
14091411
let mut exp = BytesMut::new();

readyset-common/src/lib.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,15 @@ mod tests {
117117
fn data_type_mem_size() {
118118
use std::mem::{size_of, size_of_val};
119119

120-
use chrono::NaiveDateTime;
120+
use chrono::DateTime;
121121

122122
let s = "this needs to be longer than 14 chars to make it be a Text";
123123
let txt: DfValue = DfValue::from(s);
124124
let shrt = DfValue::Int(5);
125125
let time = DfValue::TimestampTz(
126-
NaiveDateTime::from_timestamp_opt(0, 42_000_000)
126+
DateTime::from_timestamp(0, 42_000_000)
127127
.unwrap()
128+
.naive_utc()
128129
.into(),
129130
);
130131

readyset-data/benches/serde.rs

+8-3
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,15 @@ fn serde(c: &mut Criterion) {
2424

2525
let timestamp_tz = DfValue::from(chrono::TimeZone::from_utc_datetime(
2626
&chrono::FixedOffset::west_opt(18_000).unwrap(),
27-
&chrono::NaiveDateTime::from_timestamp_opt(0, 42_000_000).unwrap(),
27+
&chrono::DateTime::from_timestamp(0, 42_000_000)
28+
.unwrap()
29+
.naive_utc(),
2830
));
29-
let timestamp =
30-
DfValue::from(chrono::NaiveDateTime::from_timestamp_opt(0, 42_000_000).unwrap());
31+
let timestamp = DfValue::from(
32+
chrono::DateTime::from_timestamp(0, 42_000_000)
33+
.unwrap()
34+
.naive_utc(),
35+
);
3136

3237
let time: DfValue = MySqlTime::from_hmsus(false, 10, 30, 24, 100).into();
3338

0 commit comments

Comments
 (0)