diff --git a/Cargo.lock b/Cargo.lock index ac79f65..d1fd5c2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1922,6 +1922,17 @@ dependencies = [ "spin", ] +[[package]] +name = "flume" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e139bc46ca777eb5efaf62df0ab8cc5fd400866427e56c68b22e414e53bd3be" +dependencies = [ + "futures-core", + "futures-sink", + "spin", +] + [[package]] name = "fnv" version = "1.0.7" @@ -2158,6 +2169,17 @@ dependencies = [ "foldhash 0.1.5", ] +[[package]] +name = "hashbrown" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash 0.2.0", +] + [[package]] name = "hashbrown" version = "0.17.1" @@ -2178,6 +2200,15 @@ dependencies = [ "hashbrown 0.15.5", ] +[[package]] +name = "hashlink" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "824e001ac4f3012dd16a264bec811403a67ca9deb6c102fc5049b32c4574b35f" +dependencies = [ + "hashbrown 0.16.1", +] + [[package]] name = "heck" version = "0.4.1" @@ -2410,7 +2441,7 @@ dependencies = [ "async-trait", "iceberg", "iceberg-property-macro", - "sqlx", + "sqlx 0.8.6", "strum 0.27.2", "tracing", ] @@ -2665,7 +2696,7 @@ dependencies = [ "iceberg-catalog-sql", "infostash-model", "parquet", - "sqlx", + "sqlx 0.9.0", "tempfile", "tokio", "uuid", @@ -4081,11 +4112,21 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc" dependencies = [ - "sqlx-core", - "sqlx-macros", + "sqlx-core 0.8.6", "sqlx-mysql", "sqlx-postgres", - "sqlx-sqlite", + "sqlx-sqlite 0.8.6", +] + +[[package]] +name = "sqlx" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "378620ccc25c62c89d8be1c819e76a88d59bdcc3304733330788948e619bfd71" +dependencies = [ + "sqlx-core 0.9.0", + "sqlx-macros", + "sqlx-sqlite 0.9.0", ] [[package]] @@ -4105,7 +4146,7 @@ dependencies = [ "futures-io", "futures-util", "hashbrown 0.15.5", - "hashlink", + "hashlink 0.10.0", "indexmap 2.14.2", "log", "memchr", @@ -4116,6 +4157,37 @@ dependencies = [ "sha2 0.10.9", "smallvec", "thiserror", + "tracing", + "url", +] + +[[package]] +name = "sqlx-core" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b44e85bf579a8eeb4ceaa77a3a523baf2bf0e9bac7e40f405d537b5d2d5ccb" +dependencies = [ + "base64 0.22.1", + "bytes", + "cfg-if", + "crc", + "crossbeam-queue", + "either", + "event-listener", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashbrown 0.16.1", + "hashlink 0.11.1", + "indexmap 2.14.2", + "log", + "memchr", + "percent-encoding", + "serde", + "sha2 0.10.9", + "smallvec", + "thiserror", "tokio", "tokio-stream", "tracing", @@ -4124,35 +4196,35 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.8.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2d452988ccaacfbf5e0bdbc348fb91d7c8af5bee192173ac3636b5fb6e6715d" +checksum = "bd2b84f2bc39a5705ef27ec785a11c934a41bbd4a24941e257927cddc26b60bf" dependencies = [ "proc-macro2", "quote", - "sqlx-core", + "sqlx-core 0.9.0", "sqlx-macros-core", "syn 2.0.119", ] [[package]] name = "sqlx-macros-core" -version = "0.8.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b" +checksum = "fb8d96de5fdc85a5c4ec813432b523ec637e80ba98f046555f75f7908ddac7c3" dependencies = [ + "cfg-if", "dotenvy", "either", "heck 0.5.0", "hex", - "once_cell", "proc-macro2", "quote", "serde", "serde_json", "sha2 0.10.9", - "sqlx-core", - "sqlx-sqlite", + "sqlx-core 0.9.0", + "sqlx-sqlite 0.9.0", "syn 2.0.119", "tokio", "url", @@ -4192,7 +4264,7 @@ dependencies = [ "sha1", "sha2 0.10.9", "smallvec", - "sqlx-core", + "sqlx-core 0.8.6", "stringprep", "thiserror", "tracing", @@ -4229,7 +4301,7 @@ dependencies = [ "serde_json", "sha2 0.10.9", "smallvec", - "sqlx-core", + "sqlx-core 0.8.6", "stringprep", "thiserror", "tracing", @@ -4243,7 +4315,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea" dependencies = [ "atoi", - "flume", + "flume 0.11.1", "futures-channel", "futures-core", "futures-executor", @@ -4252,9 +4324,32 @@ dependencies = [ "libsqlite3-sys", "log", "percent-encoding", - "serde", "serde_urlencoded", - "sqlx-core", + "sqlx-core 0.8.6", + "thiserror", + "tracing", + "url", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488e99c397a62007e4229aec669a179816339afc6d2620ca6fa420dbee2e982c" +dependencies = [ + "atoi", + "flume 0.12.0", + "form_urlencoded", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core 0.9.0", "thiserror", "tracing", "url", diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml index 8772f73..df2c35b 100644 --- a/crates/storage/Cargo.toml +++ b/crates/storage/Cargo.toml @@ -18,7 +18,7 @@ parquet.workspace = true # The SQL catalog reaches databases through sqlx; this turns on its SQLite # driver so the catalog can live in one file next to the tables. A replace # also commits through it, with its own compare-and-swap (ADR 0007). -sqlx = { version = "0.8.6", default-features = false, features = ["runtime-tokio", "sqlite"] } +sqlx = { version = "0.9.0", default-features = false, features = ["runtime-tokio", "sqlite"] } uuid = { version = "1.29.0", features = ["v4"] } [dev-dependencies]