diff --git a/Cargo.lock b/Cargo.lock index 9c887514b6a5..704f08b0aee0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -380,8 +380,8 @@ dependencies = [ "futures", "once_cell", "paste", - "prost", - "prost-types", + "prost 0.13.5", + "prost-types 0.13.5", "tonic", ] @@ -2187,7 +2187,7 @@ dependencies = [ "mimalloc", "nix", "object_store", - "prost", + "prost 0.13.5", "rand 0.9.2", "serde_json", "tempfile", @@ -2270,7 +2270,7 @@ dependencies = [ "doc-comment", "futures", "log", - "prost", + "prost 0.13.5", "semver", "tokio", ] @@ -2544,9 +2544,9 @@ dependencies = [ "datafusion-proto-common", "doc-comment", "object_store", - "pbjson", + "pbjson 0.7.0", "pretty_assertions", - "prost", + "prost 0.13.5", "serde", "serde_json", "tokio", @@ -2559,8 +2559,8 @@ dependencies = [ "arrow", "datafusion-common", "doc-comment", - "pbjson", - "prost", + "pbjson 0.7.0", + "prost 0.13.5", "serde", "serde_json", ] @@ -2697,8 +2697,8 @@ dependencies = [ "insta", "itertools 0.14.0", "object_store", - "pbjson-types", - "prost", + "pbjson-types 0.7.0", + "prost 0.13.5", "serde_json", "substrait", "tokio", @@ -3190,16 +3190,16 @@ dependencies = [ name = "gen" version = "0.1.0" dependencies = [ - "pbjson-build", - "prost-build", + "pbjson-build 0.7.0", + "prost-build 0.13.5", ] [[package]] name = "gen-common" version = "0.1.0" dependencies = [ - "pbjson-build", - "prost-build", + "pbjson-build 0.7.0", + "prost-build 0.13.5", ] [[package]] @@ -4586,6 +4586,16 @@ dependencies = [ "serde", ] +[[package]] +name = "pbjson" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "898bac3fa00d0ba57a4e8289837e965baa2dee8c3749f3b11d45a64b4223d9c3" +dependencies = [ + "base64 0.22.1", + "serde", +] + [[package]] name = "pbjson-build" version = "0.7.0" @@ -4594,8 +4604,20 @@ checksum = "6eea3058763d6e656105d1403cb04e0a41b7bbac6362d413e7c33be0c32279c9" dependencies = [ "heck 0.5.0", "itertools 0.13.0", - "prost", - "prost-types", + "prost 0.13.5", + "prost-types 0.13.5", +] + +[[package]] +name = "pbjson-build" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af22d08a625a2213a78dbb0ffa253318c5c79ce3133d32d296655a7bdfb02095" +dependencies = [ + "heck 0.5.0", + "itertools 0.14.0", + "prost 0.14.1", + "prost-types 0.14.1", ] [[package]] @@ -4606,10 +4628,25 @@ checksum = "e54e5e7bfb1652f95bc361d76f3c780d8e526b134b85417e774166ee941f0887" dependencies = [ "bytes", "chrono", - "pbjson", - "pbjson-build", - "prost", - "prost-build", + "pbjson 0.7.0", + "pbjson-build 0.7.0", + "prost 0.13.5", + "prost-build 0.13.5", + "serde", +] + +[[package]] +name = "pbjson-types" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e748e28374f10a330ee3bb9f29b828c0ac79831a32bab65015ad9b661ead526" +dependencies = [ + "bytes", + "chrono", + "pbjson 0.8.0", + "pbjson-build 0.8.0", + "prost 0.14.1", + "prost-build 0.14.1", "serde", ] @@ -4924,7 +4961,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.13.5", +] + +[[package]] +name = "prost" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7231bd9b3d3d33c86b58adbac74b5ec0ad9f496b19d22801d773636feaa95f3d" +dependencies = [ + "bytes", + "prost-derive 0.14.1", ] [[package]] @@ -4940,8 +4987,28 @@ dependencies = [ "once_cell", "petgraph 0.7.1", "prettyplease", - "prost", - "prost-types", + "prost 0.13.5", + "prost-types 0.13.5", + "regex", + "syn 2.0.105", + "tempfile", +] + +[[package]] +name = "prost-build" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac6c3320f9abac597dcbc668774ef006702672474aad53c6d596b62e487b40b1" +dependencies = [ + "heck 0.5.0", + "itertools 0.14.0", + "log", + "multimap", + "once_cell", + "petgraph 0.7.1", + "prettyplease", + "prost 0.14.1", + "prost-types 0.14.1", "regex", "syn 2.0.105", "tempfile", @@ -4960,13 +5027,35 @@ dependencies = [ "syn 2.0.105", ] +[[package]] +name = "prost-derive" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425" +dependencies = [ + "anyhow", + "itertools 0.14.0", + "proc-macro2", + "quote", + "syn 2.0.105", +] + [[package]] name = "prost-types" version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16" dependencies = [ - "prost", + "prost 0.13.5", +] + +[[package]] +name = "prost-types" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9b4db3d6da204ed77bb26ba83b6122a73aeb2e87e25fbf7ad2e84c4ccbf8f72" +dependencies = [ + "prost 0.14.1", ] [[package]] @@ -6227,18 +6316,18 @@ dependencies = [ [[package]] name = "substrait" -version = "0.58.0" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de6d24c270c6c672a86c183c3a8439ba46c1936f93cf7296aa692de3b0ff0228" +checksum = "d136a14977c26d56c2e6b0984c7e24afbd210e7a4e9d5a3cf99dc3f8de925d18" dependencies = [ "heck 0.5.0", - "pbjson", - "pbjson-build", - "pbjson-types", + "pbjson 0.8.0", + "pbjson-build 0.8.0", + "pbjson-types 0.8.0", "prettyplease", - "prost", - "prost-build", - "prost-types", + "prost 0.14.1", + "prost-build 0.14.1", + "prost-types 0.14.1", "protobuf-src", "regress", "schemars 0.8.22", @@ -6679,7 +6768,7 @@ dependencies = [ "hyper-util", "percent-encoding", "pin-project", - "prost", + "prost 0.13.5", "socket2 0.5.10", "tokio", "tokio-stream", diff --git a/datafusion/substrait/Cargo.toml b/datafusion/substrait/Cargo.toml index 63a69b48866b..d6836a88a45d 100644 --- a/datafusion/substrait/Cargo.toml +++ b/datafusion/substrait/Cargo.toml @@ -39,7 +39,7 @@ itertools = { workspace = true } object_store = { workspace = true } pbjson-types = { workspace = true } prost = { workspace = true } -substrait = { version = "0.58", features = ["serde"] } +substrait = { version = "0.59", features = ["serde"] } url = { workspace = true } tokio = { workspace = true, features = ["fs"] }