From fba10a0bf582260f43142536d1d8e9cd5cda395d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Sep 2023 18:35:26 +0000 Subject: [PATCH 1/2] chore(deps): Bump prost from 0.11.9 to 0.12.1 Bumps [prost](https://github.com/tokio-rs/prost) from 0.11.9 to 0.12.1. - [Release notes](https://github.com/tokio-rs/prost/releases) - [Commits](https://github.com/tokio-rs/prost/compare/v0.11.9...v0.12.1) --- updated-dependencies: - dependency-name: prost dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 73 +++++++++++++++++++++++------------ src/common/Cargo.toml | 2 +- src/connector/Cargo.toml | 2 +- src/java_binding/Cargo.toml | 2 +- src/jni_core/Cargo.toml | 2 +- src/meta/Cargo.toml | 2 +- src/prost/Cargo.toml | 2 +- src/storage/Cargo.toml | 2 +- src/storage/backup/Cargo.toml | 2 +- src/stream/Cargo.toml | 2 +- src/workspace-hack/Cargo.toml | 4 +- 11 files changed, 59 insertions(+), 36 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cf9a9dcd9540..786d011d0988 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -321,7 +321,7 @@ dependencies = [ "bytes", "futures", "paste", - "prost", + "prost 0.11.9", "tokio", "tonic", ] @@ -1729,7 +1729,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e" dependencies = [ - "prost", + "prost 0.11.9", "prost-types", "tonic", "tracing-core", @@ -2646,7 +2646,7 @@ version = "0.11.1" source = "git+https://github.com/risingwavelabs/etcd-client.git?rev=d55550a#d55550a182f2119e39e64858771468e1b26f6777" dependencies = [ "http", - "prost", + "prost 0.11.9", "tokio", "tokio-stream", "tonic", @@ -3293,7 +3293,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5453af21ac0cc1f3b2cfb5b687c174e701c10ec2d5c286aff7ca8cbbf08d31b4" dependencies = [ - "prost", + "prost 0.11.9", "prost-types", "tonic", ] @@ -5160,7 +5160,7 @@ dependencies = [ "opentelemetry-semantic-conventions", "opentelemetry_api", "opentelemetry_sdk", - "prost", + "prost 0.11.9", "thiserror", "tokio", "tonic", @@ -5174,7 +5174,7 @@ checksum = "b1e3f814aa9f8c905d0ee4bde026afd3b2577a97c10e1699912e3e44f0c4cbeb" dependencies = [ "opentelemetry_api", "opentelemetry_sdk", - "prost", + "prost 0.11.9", "tonic", ] @@ -5449,7 +5449,7 @@ checksum = "bdbb7b706f2afc610f3853550cdbbf6372fd324824a087806bd4480ea4996e24" dependencies = [ "heck 0.4.1", "itertools 0.10.5", - "prost", + "prost 0.11.9", "prost-types", ] @@ -5962,7 +5962,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.11.9", +] + +[[package]] +name = "prost" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" +dependencies = [ + "bytes", + "prost-derive 0.12.1", ] [[package]] @@ -5979,7 +5989,7 @@ dependencies = [ "multimap", "petgraph", "prettyplease", - "prost", + "prost 0.11.9", "prost-types", "regex", "syn 1.0.109", @@ -6000,6 +6010,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "prost-derive" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32" +dependencies = [ + "anyhow", + "itertools 0.11.0", + "proc-macro2", + "quote", + "syn 2.0.33", +] + [[package]] name = "prost-helpers" version = "0.1.0" @@ -6017,7 +6040,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b823de344848e011658ac981009100818b322421676740546f8b52ed5249428" dependencies = [ "once_cell", - "prost", + "prost 0.11.9", "prost-types", ] @@ -6027,7 +6050,7 @@ version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ - "prost", + "prost 0.11.9", ] [[package]] @@ -6111,9 +6134,9 @@ dependencies = [ "oauth2", "openidconnect", "pem 1.1.1", - "prost", + "prost 0.11.9", "prost-build", - "prost-derive", + "prost-derive 0.11.9", "rand", "regex", "serde", @@ -6509,7 +6532,7 @@ dependencies = [ "bytes", "itertools 0.11.0", "parking_lot 0.12.1", - "prost", + "prost 0.12.1", "risingwave_common", "risingwave_hummock_sdk", "risingwave_object_store", @@ -6717,7 +6740,7 @@ dependencies = [ "pretty_assertions", "procfs 0.15.1", "prometheus", - "prost", + "prost 0.12.1", "rand", "regex", "reqwest", @@ -6926,7 +6949,7 @@ dependencies = [ "parking_lot 0.12.1", "paste", "prometheus", - "prost", + "prost 0.12.1", "prost-build", "prost-reflect", "prost-types", @@ -7190,7 +7213,7 @@ dependencies = [ "madsim-tokio", "mockall", "parking_lot 0.12.1", - "prost", + "prost 0.11.9", "risingwave_common", "risingwave_hummock_sdk", "risingwave_pb", @@ -7202,7 +7225,7 @@ dependencies = [ name = "risingwave_java_binding" version = "0.1.0" dependencies = [ - "prost", + "prost 0.12.1", "risingwave_common", "risingwave_expr", "risingwave_jni_core", @@ -7220,7 +7243,7 @@ dependencies = [ "itertools 0.11.0", "jni", "madsim-tokio", - "prost", + "prost 0.12.1", "risingwave_common", "risingwave_expr", "risingwave_hummock_sdk", @@ -7268,7 +7291,7 @@ dependencies = [ "parking_lot 0.12.1", "prometheus", "prometheus-http-query", - "prost", + "prost 0.12.1", "rand", "regex", "reqwest", @@ -7338,7 +7361,7 @@ dependencies = [ "madsim-tonic-build", "pbjson", "pbjson-build", - "prost", + "prost 0.12.1", "prost-helpers", "serde", "walkdir", @@ -7614,7 +7637,7 @@ dependencies = [ "parking_lot 0.12.1", "procfs 0.15.1", "prometheus", - "prost", + "prost 0.12.1", "rand", "risingwave_backup", "risingwave_common", @@ -7677,7 +7700,7 @@ dependencies = [ "parse-display", "pin-project", "prometheus", - "prost", + "prost 0.12.1", "rand", "risingwave_common", "risingwave_connector", @@ -9466,7 +9489,7 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost", + "prost 0.11.9", "rustls-pemfile", "tokio", "tokio-rustls 0.24.1", @@ -10327,7 +10350,7 @@ dependencies = [ "postgres-types", "proc-macro2", "prometheus", - "prost", + "prost 0.12.1", "rand", "rand_chacha", "rand_core", diff --git a/src/common/Cargo.toml b/src/common/Cargo.toml index 92992687c6c2..ad759f9e4a54 100644 --- a/src/common/Cargo.toml +++ b/src/common/Cargo.toml @@ -64,7 +64,7 @@ postgres-types = { version = "0.2.6", features = [ ] } prehash = "1" prometheus = { version = "0.13" } -prost = "0.11" +prost = "0.12" rand = "0.8" regex = "1" reqwest = { version = "0.11", features = ["json"] } diff --git a/src/connector/Cargo.toml b/src/connector/Cargo.toml index c8cb5a0204fa..1dfe78342d05 100644 --- a/src/connector/Cargo.toml +++ b/src/connector/Cargo.toml @@ -72,7 +72,7 @@ opendal = "0.39" parking_lot = "0.12" paste = "1" prometheus = { version = "0.13", features = ["process"] } -prost = { version = "0.11", features = ["no-recursion-limit"] } +prost = { version = "0.12", features = ["no-recursion-limit"] } prost-reflect = "0.11" protobuf-native = "0.2.1" pulsar = { version = "6.0", default-features = false, features = [ diff --git a/src/java_binding/Cargo.toml b/src/java_binding/Cargo.toml index d8d90693f44a..6daf2a74ad43 100644 --- a/src/java_binding/Cargo.toml +++ b/src/java_binding/Cargo.toml @@ -10,7 +10,7 @@ ignored = ["workspace-hack"] normal = ["workspace-hack"] [dependencies] -prost = "0.11" +prost = "0.12" risingwave_common = { workspace = true } risingwave_jni_core = { workspace = true } risingwave_pb = { workspace = true } diff --git a/src/jni_core/Cargo.toml b/src/jni_core/Cargo.toml index c8bba371c8de..a40e7138d16c 100644 --- a/src/jni_core/Cargo.toml +++ b/src/jni_core/Cargo.toml @@ -14,7 +14,7 @@ bytes = "1" futures = { version = "0.3", default-features = false, features = ["alloc"] } itertools = "0.11" jni = "0.21.1" -prost = "0.11" +prost = "0.12" risingwave_common = { workspace = true } risingwave_hummock_sdk = { workspace = true } risingwave_object_store = { workspace = true } diff --git a/src/meta/Cargo.toml b/src/meta/Cargo.toml index 329fb4fdc1fd..46b6fd707d16 100644 --- a/src/meta/Cargo.toml +++ b/src/meta/Cargo.toml @@ -41,7 +41,7 @@ num-traits = "0.2" parking_lot = { version = "0.12", features = ["arc_lock"] } prometheus = "0.13" prometheus-http-query = "0.6" -prost = "0.11" +prost = "0.12" rand = "0.8" regex = "1" reqwest = "0.11" diff --git a/src/prost/Cargo.toml b/src/prost/Cargo.toml index dc6375662f80..446d5c31af18 100644 --- a/src/prost/Cargo.toml +++ b/src/prost/Cargo.toml @@ -10,7 +10,7 @@ repository = { workspace = true } [dependencies] enum-as-inner = "0.6" pbjson = "0.6" -prost = "0.11" +prost = "0.12" prost-helpers = { path = "helpers" } serde = { version = "1", features = ["derive"] } tonic = { workspace = true } diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml index 8c03464e34ae..98add6a4b28d 100644 --- a/src/storage/Cargo.toml +++ b/src/storage/Cargo.toml @@ -38,7 +38,7 @@ more-asserts = "0.3" num-integer = "0.1" parking_lot = "0.12" prometheus = { version = "0.13", features = ["process"] } -prost = "0.11" +prost = "0.12" rand = "0.8" risingwave_backup = { workspace = true } risingwave_common = { workspace = true } diff --git a/src/storage/backup/Cargo.toml b/src/storage/backup/Cargo.toml index c36dd17f364c..b06e33c344f4 100644 --- a/src/storage/backup/Cargo.toml +++ b/src/storage/backup/Cargo.toml @@ -19,7 +19,7 @@ async-trait = "0.1" bytes = { version = "1", features = ["serde"] } itertools = "0.11" parking_lot = { version = "0.12", features = ["arc_lock"] } -prost = "0.11" +prost = "0.12" risingwave_common = { workspace = true } risingwave_hummock_sdk = { workspace = true } risingwave_object_store = { workspace = true } diff --git a/src/stream/Cargo.toml b/src/stream/Cargo.toml index 79db63474cfd..6d04318949df 100644 --- a/src/stream/Cargo.toml +++ b/src/stream/Cargo.toml @@ -41,7 +41,7 @@ parking_lot = "0.12" parse-display = "0.8" pin-project = "1" prometheus = { version = "0.13", features = ["process"] } -prost = "0.11" +prost = "0.12" rand = "0.8" risingwave_common = { workspace = true } risingwave_connector = { workspace = true } diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index acbc053ff998..674dee10ce73 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -86,7 +86,7 @@ phf = { version = "0.11", features = ["uncased"] } phf_shared = { version = "0.11", features = ["uncased"] } postgres-types = { version = "0.2", default-features = false, features = ["derive", "with-chrono-0_4", "with-serde_json-1"] } prometheus = { version = "0.13", features = ["process"] } -prost = { version = "0.11", features = ["no-recursion-limit"] } +prost = { version = "0.12", features = ["no-recursion-limit"] } rand = { version = "0.8", features = ["small_rng"] } rand_chacha = { version = "0.3" } rand_core = { version = "0.6", default-features = false, features = ["std"] } @@ -174,7 +174,7 @@ petgraph = { version = "0.6" } phf = { version = "0.11", features = ["uncased"] } phf_shared = { version = "0.11", features = ["uncased"] } proc-macro2 = { version = "1", features = ["span-locations"] } -prost = { version = "0.11", features = ["no-recursion-limit"] } +prost = { version = "0.12", features = ["no-recursion-limit"] } rand = { version = "0.8", features = ["small_rng"] } rand_chacha = { version = "0.3" } rand_core = { version = "0.6", default-features = false, features = ["std"] } From 39b9e62ee9d8052f8d00222e7416b35fb3bf9eea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 20 Sep 2023 18:36:58 +0000 Subject: [PATCH 2/2] Fix "cargo-hakari" --- Cargo.lock | 2 ++ src/workspace-hack/Cargo.toml | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 786d011d0988..660d100869d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10319,6 +10319,7 @@ dependencies = [ "hyper", "indexmap 1.9.3", "itertools 0.10.5", + "itertools 0.11.0", "jni", "lazy_static", "lexical-core", @@ -10350,6 +10351,7 @@ dependencies = [ "postgres-types", "proc-macro2", "prometheus", + "prost 0.11.9", "prost 0.12.1", "rand", "rand_chacha", diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index 674dee10ce73..3863ebab0f90 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -55,7 +55,8 @@ hashbrown-5ef9efb8ec2df382 = { package = "hashbrown", version = "0.12", features heck = { version = "0.4", features = ["unicode"] } hyper = { version = "0.14", features = ["full"] } indexmap = { version = "1", default-features = false, features = ["std"] } -itertools = { version = "0.10" } +itertools-93f6ce9d446188ac = { package = "itertools", version = "0.10" } +itertools-a6292c17cd707f01 = { package = "itertools", version = "0.11" } jni = { version = "0.21", features = ["invocation"] } lazy_static = { version = "1", default-features = false, features = ["spin_no_std"] } lexical-core = { version = "0.8", features = ["format"] } @@ -86,7 +87,8 @@ phf = { version = "0.11", features = ["uncased"] } phf_shared = { version = "0.11", features = ["uncased"] } postgres-types = { version = "0.2", default-features = false, features = ["derive", "with-chrono-0_4", "with-serde_json-1"] } prometheus = { version = "0.13", features = ["process"] } -prost = { version = "0.12", features = ["no-recursion-limit"] } +prost-5ef9efb8ec2df382 = { package = "prost", version = "0.12", features = ["no-recursion-limit"] } +prost-a6292c17cd707f01 = { package = "prost", version = "0.11" } rand = { version = "0.8", features = ["small_rng"] } rand_chacha = { version = "0.3" } rand_core = { version = "0.6", default-features = false, features = ["std"] } @@ -154,7 +156,8 @@ futures-task = { version = "0.3" } futures-util = { version = "0.3", features = ["channel", "io", "sink"] } hashbrown-582f2526e08bb6a0 = { package = "hashbrown", version = "0.14", features = ["nightly", "raw"] } heck = { version = "0.4", features = ["unicode"] } -itertools = { version = "0.10" } +itertools-93f6ce9d446188ac = { package = "itertools", version = "0.10" } +itertools-a6292c17cd707f01 = { package = "itertools", version = "0.11" } lazy_static = { version = "1", default-features = false, features = ["spin_no_std"] } libc = { version = "0.2", features = ["extra_traits"] } lock_api = { version = "0.4", features = ["arc_lock"] } @@ -174,7 +177,7 @@ petgraph = { version = "0.6" } phf = { version = "0.11", features = ["uncased"] } phf_shared = { version = "0.11", features = ["uncased"] } proc-macro2 = { version = "1", features = ["span-locations"] } -prost = { version = "0.12", features = ["no-recursion-limit"] } +prost-a6292c17cd707f01 = { package = "prost", version = "0.11" } rand = { version = "0.8", features = ["small_rng"] } rand_chacha = { version = "0.3" } rand_core = { version = "0.6", default-features = false, features = ["std"] }