diff --git a/Cargo.lock b/Cargo.lock index a933c07e185..b479e77c97a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -281,7 +281,7 @@ dependencies = [ "futures", "once_cell", "paste", - "prost", + "prost 0.11.9", "tokio", "tonic 0.9.2", ] @@ -1078,8 +1078,8 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e" dependencies = [ - "prost", - "prost-types", + "prost 0.11.9", + "prost-types 0.11.9", "tonic 0.9.2", "tracing-core", ] @@ -1097,7 +1097,7 @@ dependencies = [ "hdrhistogram", "humantime", "parking_lot", - "prost-types", + "prost-types 0.11.9", "serde", "serde_json", "thread_local", @@ -1573,7 +1573,7 @@ dependencies = [ "datafusion-common", "datafusion-expr", "object_store", - "prost", + "prost 0.11.9", ] [[package]] @@ -1851,7 +1851,7 @@ dependencies = [ "iox_query", "observability_deps", "once_cell", - "prost", + "prost 0.11.9", "snafu", "workspace-hack", ] @@ -2034,11 +2034,11 @@ version = "0.1.0" dependencies = [ "bytes", "observability_deps", - "pbjson 0.6.0", - "pbjson-build", + "pbjson", + "pbjson-build 0.5.1", "pbjson-types", - "prost", - "prost-build", + "prost 0.11.9", + "prost-build 0.11.9", "serde", "tonic 0.9.2", "tonic-build", @@ -2086,8 +2086,8 @@ dependencies = [ "futures", "hashbrown 0.14.0", "metric", - "prost", - "prost-build", + "prost 0.11.9", + "prost-build 0.11.9", "rand", "test_helpers", "thiserror", @@ -2160,8 +2160,8 @@ dependencies = [ "http-body", "hyper", "pin-project", - "prost", - "prost-build", + "prost 0.11.9", + "prost-build 0.11.9", "tokio", "tokio-stream", "tonic 0.9.2", @@ -2174,9 +2174,9 @@ dependencies = [ name = "grpc-binary-logger-proto" version = "0.1.0" dependencies = [ - "prost", - "prost-build", - "prost-types", + "prost 0.11.9", + "prost-build 0.11.9", + "prost-types 0.11.9", "tonic 0.9.2", "tonic-build", "workspace-hack", @@ -2186,8 +2186,8 @@ dependencies = [ name = "grpc-binary-logger-test-proto" version = "0.1.0" dependencies = [ - "prost", - "prost-build", + "prost 0.11.9", + "prost-build 0.11.9", "tonic 0.9.2", "tonic-build", "workspace-hack", @@ -2643,7 +2643,7 @@ dependencies = [ "predicates", "pretty_assertions", "proptest", - "prost", + "prost 0.11.9", "rustyline", "schema", "serde", @@ -2682,7 +2682,7 @@ dependencies = [ "generated_types", "influxdb-line-protocol", "insta", - "prost", + "prost 0.11.9", "rand", "reqwest", "schema", @@ -2701,7 +2701,7 @@ dependencies = [ "futures-util", "generated_types", "observability_deps", - "prost", + "prost 0.11.9", "tonic 0.9.2", "workspace-hack", ] @@ -2812,7 +2812,7 @@ dependencies = [ "pin-project", "predicate", "proptest", - "prost", + "prost 0.11.9", "rand", "schema", "service_grpc_catalog", @@ -2869,11 +2869,11 @@ dependencies = [ "datafusion", "datafusion-proto", "flatbuffers", - "pbjson 0.6.0", - "pbjson-build", + "pbjson", + "pbjson-build 0.5.1", "predicate", - "prost", - "prost-build", + "prost 0.11.9", + "prost-build 0.11.9", "query_functions", "serde", "snafu", @@ -2906,7 +2906,7 @@ dependencies = [ "object_store", "observability_deps", "parquet_file", - "prost", + "prost 0.11.9", "tempfile", "test_helpers", "tokio", @@ -3732,7 +3732,7 @@ dependencies = [ "mutable_batch", "mutable_batch_lp", "mutable_batch_pb", - "prost", + "prost 0.11.9", ] [[package]] @@ -4125,7 +4125,7 @@ dependencies = [ "observability_deps", "parquet", "pbjson-types", - "prost", + "prost 0.11.9", "rand", "schema", "snafu", @@ -4171,16 +4171,6 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" -[[package]] -name = "pbjson" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048f9ac93c1eab514f9470c4bc8d97ca2a0a236b84f45cc19d69a59fc11467f6" -dependencies = [ - "base64 0.13.1", - "serde", -] - [[package]] name = "pbjson" version = "0.6.0" @@ -4199,22 +4189,34 @@ checksum = "bdbb7b706f2afc610f3853550cdbbf6372fd324824a087806bd4480ea4996e24" dependencies = [ "heck", "itertools 0.10.5", - "prost", - "prost-types", + "prost 0.11.9", + "prost-types 0.11.9", +] + +[[package]] +name = "pbjson-build" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2580e33f2292d34be285c5bc3dba5259542b083cfad6037b6d70345f24dcb735" +dependencies = [ + "heck", + "itertools 0.11.0", + "prost 0.12.1", + "prost-types 0.12.1", ] [[package]] name = "pbjson-types" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a88c8d87f99a4ac14325e7a4c24af190fca261956e3b82dd7ed67e77e6c7043" +checksum = "18f596653ba4ac51bdecbb4ef6773bc7f56042dc13927910de1684ad3d32aa12" dependencies = [ "bytes", "chrono", - "pbjson 0.5.1", - "pbjson-build", - "prost", - "prost-build", + "pbjson", + "pbjson-build 0.6.2", + "prost 0.12.1", + "prost-build 0.12.1", "serde", ] @@ -4408,9 +4410,9 @@ dependencies = [ "nix 0.26.4", "once_cell", "parking_lot", - "prost", - "prost-build", - "prost-derive", + "prost 0.11.9", + "prost-build 0.11.9", + "prost-derive 0.11.9", "protobuf", "sha2", "smallvec", @@ -4495,6 +4497,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "prettyplease" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" +dependencies = [ + "proc-macro2", + "syn 2.0.29", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -4572,7 +4584,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]] @@ -4588,15 +4610,37 @@ dependencies = [ "log", "multimap", "petgraph", - "prettyplease", - "prost", - "prost-types", + "prettyplease 0.1.25", + "prost 0.11.9", + "prost-types 0.11.9", "regex", "syn 1.0.109", "tempfile", "which", ] +[[package]] +name = "prost-build" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bdf592881d821b83d471f8af290226c8d51402259e9bb5be7f9f8bdebbb11ac" +dependencies = [ + "bytes", + "heck", + "itertools 0.11.0", + "log", + "multimap", + "once_cell", + "petgraph", + "prettyplease 0.2.12", + "prost 0.12.1", + "prost-types 0.12.1", + "regex", + "syn 2.0.29", + "tempfile", + "which", +] + [[package]] name = "prost-derive" version = "0.11.9" @@ -4610,13 +4654,35 @@ 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.29", +] + [[package]] name = "prost-types" version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ - "prost", + "prost 0.11.9", +] + +[[package]] +name = "prost-types" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf" +dependencies = [ + "prost 0.12.1", ] [[package]] @@ -4661,7 +4727,7 @@ dependencies = [ "parquet_file", "pin-project", "predicate", - "prost", + "prost 0.11.9", "rand", "schema", "service_common", @@ -5273,7 +5339,7 @@ dependencies = [ "iox_query", "metric", "observability_deps", - "prost", + "prost 0.11.9", "serde", "serde_json", "service_common", @@ -5305,7 +5371,7 @@ dependencies = [ "parking_lot", "pin-project", "predicate", - "prost", + "prost 0.11.9", "query_functions", "regex", "schema", @@ -6032,7 +6098,7 @@ dependencies = [ "observability_deps", "once_cell", "parking_lot", - "prost", + "prost 0.11.9", "rand", "regex", "reqwest", @@ -6294,8 +6360,8 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost", - "prost-derive", + "prost 0.11.9", + "prost-derive 0.11.9", "tokio", "tokio-stream", "tokio-util", @@ -6326,7 +6392,7 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost", + "prost 0.11.9", "rustls-pemfile", "tokio", "tokio-rustls", @@ -6344,9 +6410,9 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" dependencies = [ - "prettyplease", + "prettyplease 0.1.25", "proc-macro2", - "prost-build", + "prost-build 0.11.9", "quote", "syn 1.0.109", ] @@ -6358,7 +6424,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "080964d45894b90273d2b1dd755fdd114560db8636bb41cea615213c45043c4d" dependencies = [ "async-stream", - "prost", + "prost 0.11.9", "tokio", "tokio-stream", "tonic 0.9.2", @@ -6370,8 +6436,8 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0543d7092032041fbeac1f2c84304537553421a11a623c2301b12ef0264862c7" dependencies = [ - "prost", - "prost-types", + "prost 0.11.9", + "prost-types 0.11.9", "tokio", "tokio-stream", "tonic 0.9.2", @@ -6745,7 +6811,7 @@ dependencies = [ "mutable_batch_pb", "observability_deps", "parking_lot", - "prost", + "prost 0.11.9", "snafu", "snap", "test_helpers", @@ -7170,8 +7236,8 @@ dependencies = [ "phf_shared", "predicates", "proptest", - "prost", - "prost-types", + "prost 0.11.9", + "prost-types 0.11.9", "rand", "rand_core", "regex", diff --git a/generated_types/Cargo.toml b/generated_types/Cargo.toml index d69f4676569..8537d4cc377 100644 --- a/generated_types/Cargo.toml +++ b/generated_types/Cargo.toml @@ -8,7 +8,7 @@ license.workspace = true [dependencies] # In alphabetical order observability_deps = { path = "../observability_deps" } pbjson = "0.6" -pbjson-types = "0.5" +pbjson-types = "0.6" prost = "0.11" serde = { version = "1.0", features = ["derive"] } tonic = { workspace = true } diff --git a/parquet_file/Cargo.toml b/parquet_file/Cargo.toml index 5f616f1d3f3..c3fb7217ce6 100644 --- a/parquet_file/Cargo.toml +++ b/parquet_file/Cargo.toml @@ -18,7 +18,7 @@ iox_time = { path = "../iox_time" } object_store = { workspace = true } observability_deps = { path = "../observability_deps" } parquet = { workspace = true, features = ["experimental"]} -pbjson-types = "0.5" +pbjson-types = "0.6" prost = "0.11" schema = { path = "../schema" } snafu = "0.7"