diff --git a/Cargo.lock b/Cargo.lock index 853dd540..93467c21 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -323,10 +323,10 @@ dependencies = [ "futures", "once_cell", "paste", - "prost", + "prost 0.12.6", "prost-types", "tokio", - "tonic", + "tonic 0.11.0", ] [[package]] @@ -909,7 +909,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.3.4", "bitflags 1.3.2", "bytes", "futures-util", @@ -930,6 +930,33 @@ dependencies = [ "tower-service", ] +[[package]] +name = "axum" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae" +dependencies = [ + "async-trait", + "axum-core 0.4.5", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper 1.0.1", + "tower 0.5.1", + "tower-layer", + "tower-service", +] + [[package]] name = "axum-core" version = "0.3.4" @@ -947,6 +974,26 @@ dependencies = [ "tower-service", ] +[[package]] +name = "axum-core" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 1.0.1", + "tower-layer", + "tower-service", +] + [[package]] name = "backtrace" version = "0.3.74" @@ -1449,8 +1496,8 @@ name = "clade" version = "0.1.0" dependencies = [ "arrow-flight", - "prost", - "tonic", + "prost 0.12.6", + "tonic 0.12.3", "tonic-build", ] @@ -2446,7 +2493,7 @@ dependencies = [ "datafusion-expr", "datafusion-proto-common", "object_store", - "prost", + "prost 0.12.6", ] [[package]] @@ -2459,7 +2506,7 @@ dependencies = [ "chrono", "datafusion-common", "object_store", - "prost", + "prost 0.12.6", ] [[package]] @@ -3631,6 +3678,19 @@ dependencies = [ "tokio-io-timeout", ] +[[package]] +name = "hyper-timeout" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" +dependencies = [ + "hyper 1.4.1", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + [[package]] name = "hyper-tls" version = "0.6.0" @@ -5173,6 +5233,15 @@ dependencies = [ "prost-derive", ] +[[package]] +name = "prost" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" +dependencies = [ + "bytes", +] + [[package]] name = "prost-build" version = "0.12.6" @@ -5187,7 +5256,7 @@ dependencies = [ "once_cell", "petgraph", "prettyplease", - "prost", + "prost 0.12.6", "prost-types", "regex", "syn 2.0.82", @@ -5213,7 +5282,7 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost", + "prost 0.12.6", ] [[package]] @@ -6094,7 +6163,7 @@ dependencies = [ "object_store", "object_store_factory", "percent-encoding", - "prost", + "prost 0.12.6", "rand", "regex", "reqwest", @@ -6115,7 +6184,7 @@ dependencies = [ "thiserror", "tokio", "tokio-graceful-shutdown", - "tonic", + "tonic 0.12.3", "tonic-reflection", "tower 0.5.1", "tracing", @@ -7201,17 +7270,47 @@ checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" dependencies = [ "async-stream", "async-trait", - "axum", + "axum 0.6.20", "base64 0.21.7", "bytes", "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.30", - "hyper-timeout", + "hyper-timeout 0.4.1", + "percent-encoding", + "pin-project", + "prost 0.12.6", + "tokio", + "tokio-stream", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tonic" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" +dependencies = [ + "async-stream", + "async-trait", + "axum 0.7.7", + "base64 0.22.1", + "bytes", + "h2 0.4.6", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", + "hyper-timeout 0.5.1", + "hyper-util", "percent-encoding", "pin-project", - "prost", + "prost 0.13.3", + "socket2 0.5.7", "tokio", "tokio-stream", "tower 0.4.13", @@ -7239,11 +7338,11 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "548c227bd5c0fae5925812c4ec6c66ffcfced23ea370cb823f4d18f0fc1cb6a7" dependencies = [ - "prost", + "prost 0.12.6", "prost-types", "tokio", "tokio-stream", - "tonic", + "tonic 0.11.0", ] [[package]] @@ -7272,6 +7371,10 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", "tower-layer", "tower-service", ] diff --git a/Cargo.toml b/Cargo.toml index ec49be9c..dfa49ec7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -130,7 +130,7 @@ tempfile = "3" thiserror = "1" tokio = { workspace = true } tokio-graceful-shutdown = { version = "0.15" } -tonic = { version = "0.11.0", optional = true } +tonic = { version = "0.12.3", optional = true } tower = "0.5" tracing = { workspace = true } tracing-log = "0.2" diff --git a/clade/Cargo.toml b/clade/Cargo.toml index 26502444..e505804e 100644 --- a/clade/Cargo.toml +++ b/clade/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] arrow-flight = { workspace = true } prost = { workspace = true } -tonic = "0.11" +tonic = "0.12" [build-dependencies] tonic-build = "0.11"