From 9faa4d9090a27ed617f3a319601270a3740f5adb Mon Sep 17 00:00:00 2001 From: Sean Loiselle Date: Tue, 20 Jun 2023 16:07:44 -0400 Subject: [PATCH 1/2] storage-client: add param to disable shard finalization --- src/adapter/src/catalog.rs | 1 + src/sql/src/session/vars.rs | 14 ++++++++++++++ src/storage-client/src/controller.rs | 4 +++- src/storage-client/src/types/parameters.proto | 1 + src/storage-client/src/types/parameters.rs | 8 ++++++++ 5 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/adapter/src/catalog.rs b/src/adapter/src/catalog.rs index 5de5c3c83f2c1..eaa48f3af6d4e 100644 --- a/src/adapter/src/catalog.rs +++ b/src/adapter/src/catalog.rs @@ -7343,6 +7343,7 @@ impl Catalog { } } }, + finalize_shards: self.system_config().storage_client_finalize_shards(), } } diff --git a/src/sql/src/session/vars.rs b/src/sql/src/session/vars.rs index da662d7c8c210..0090d744c5c4f 100644 --- a/src/sql/src/session/vars.rs +++ b/src/sql/src/session/vars.rs @@ -959,6 +959,15 @@ const KEEP_N_SOURCE_STATUS_HISTORY_ENTRIES: ServerVar = ServerVar { internal: true }; +/// Whether compute rendering should use Materialize's custom linear join implementation rather +/// than the one from Differential Dataflow. +const STORAGE_CLIENT_FINALIZE_SHARDS: ServerVar = ServerVar { + name: UncasedStr::new("storage_client_finalize_shards"), + value: &true, + description: "Whether to all the storage client to finalize shards (Materialize).", + internal: true, +}; + // Macro to simplify creating feature flags, i.e. boolean flags that we use to toggle the // availability of features. // @@ -2203,6 +2212,11 @@ impl SystemVars { pub fn enable_mz_join_core(&self) -> bool { *self.expect_value(&ENABLE_MZ_JOIN_CORE) } + + /// Returns the `pg_replication_tcp_user_timeout` configuration parameter. + pub fn storage_client_finalize_shards(&self) -> bool { + *self.expect_value(&STORAGE_CLIENT_FINALIZE_SHARDS) + } } /// A `Var` represents a configuration parameter of an arbitrary type. diff --git a/src/storage-client/src/controller.rs b/src/storage-client/src/controller.rs index 5e541410e4de5..8473fe323c7bd 100644 --- a/src/storage-client/src/controller.rs +++ b/src/storage-client/src/controller.rs @@ -2295,7 +2295,9 @@ where .await .expect("stash operation must succeed"); - self.finalize_shards().await; + if self.state.config.finalize_shards { + self.finalize_shards().await; + } } Some(StorageResponse::StatisticsUpdates(source_stats, sink_stats)) => { // Note we only hold the locks while moving some plain-old-data around here. diff --git a/src/storage-client/src/types/parameters.proto b/src/storage-client/src/types/parameters.proto index 1aa52c9202213..72fa4fcb3d47d 100644 --- a/src/storage-client/src/types/parameters.proto +++ b/src/storage-client/src/types/parameters.proto @@ -21,6 +21,7 @@ message ProtoStorageParameters { ProtoPgReplicationTimeouts pg_replication_timeouts = 3; uint64 keep_n_source_status_history_entries = 4; mz_rocksdb.config.ProtoRocksDbTuningParameters upsert_rocksdb_tuning_config = 5; + bool finalize_shards = 6; } diff --git a/src/storage-client/src/types/parameters.rs b/src/storage-client/src/types/parameters.rs index 52db6ef50b72f..c2d5244994f52 100644 --- a/src/storage-client/src/types/parameters.rs +++ b/src/storage-client/src/types/parameters.rs @@ -31,6 +31,10 @@ pub struct StorageParameters { pub keep_n_source_status_history_entries: usize, /// A set of parameters used to tune RocksDB when used with `UPSERT` sources. pub upsert_rocksdb_tuning_config: mz_rocksdb::RocksDBTuningParameters, + /// Whether or not to allow shard finalization to occur. Note that this will + /// only disable the actual finalization of shards, not registering them for + /// finalization. + pub finalize_shards: bool, } impl StorageParameters { @@ -42,12 +46,14 @@ impl StorageParameters { pg_replication_timeouts, keep_n_source_status_history_entries, upsert_rocksdb_tuning_config, + finalize_shards, }: StorageParameters, ) { self.persist.update(persist); self.pg_replication_timeouts = pg_replication_timeouts; self.keep_n_source_status_history_entries = keep_n_source_status_history_entries; self.upsert_rocksdb_tuning_config = upsert_rocksdb_tuning_config; + self.finalize_shards = finalize_shards } } @@ -60,6 +66,7 @@ impl RustType for StorageParameters { self.keep_n_source_status_history_entries, ), upsert_rocksdb_tuning_config: Some(self.upsert_rocksdb_tuning_config.into_proto()), + finalize_shards: self.finalize_shards, } } @@ -77,6 +84,7 @@ impl RustType for StorageParameters { upsert_rocksdb_tuning_config: proto .upsert_rocksdb_tuning_config .into_rust_if_some("ProtoStorageParameters::upsert_rocksdb_tuning_config")?, + finalize_shards: proto.finalize_shards, }) } } From 8b926a5a86f1b9b48d2a7c1e56c0047f9d9957ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 2 Jul 2023 23:40:20 +0000 Subject: [PATCH 2/2] build(deps): bump clap from 3.2.24 to 4.3.10 Bumps [clap](https://github.com/clap-rs/clap) from 3.2.24 to 4.3.10. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v3.2.24...v4.3.10) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Cargo.lock | 184 +++++++++++++++++-------- src/cluster/Cargo.toml | 2 +- src/clusterd/Cargo.toml | 2 +- src/compute/Cargo.toml | 2 +- src/environmentd/Cargo.toml | 2 +- src/interchange/Cargo.toml | 2 +- src/kafka-util/Cargo.toml | 2 +- src/mz/Cargo.toml | 2 +- src/orchestrator-kubernetes/Cargo.toml | 2 +- src/orchestrator-tracing/Cargo.toml | 2 +- src/ore/Cargo.toml | 2 +- src/persist-client/Cargo.toml | 4 +- src/pgtest/Cargo.toml | 2 +- src/s3-datagen/Cargo.toml | 2 +- src/service/Cargo.toml | 2 +- src/sqllogictest/Cargo.toml | 2 +- src/stash-debug/Cargo.toml | 2 +- src/storage/Cargo.toml | 4 +- src/testdrive/Cargo.toml | 2 +- src/workspace-hack/Cargo.toml | 4 +- 20 files changed, 150 insertions(+), 78 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1b6281bae44b8..677438fa389eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -77,6 +77,55 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse 0.2.1", +] + +[[package]] +name = "anstyle" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse 0.2.1", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + [[package]] name = "anyhow" version = "1.0.66" @@ -1099,33 +1148,50 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.24" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eef2b3ded6a26dfaec672a742c93c8cf6b689220324da509ec5caa20de55dc83" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ - "atty", "bitflags", - "clap_derive", - "clap_lex", + "clap_lex 0.2.2", "indexmap", + "textwrap", +] + +[[package]] +name = "clap" +version = "4.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a" +dependencies = [ + "clap_builder", + "clap_derive", "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d" +dependencies = [ + "anstream", + "anstyle", + "clap_lex 0.5.0", "strsim", - "termcolor", "terminal_size", - "textwrap", ] [[package]] name = "clap_derive" -version = "3.2.24" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d756c5824fc5c0c1ee8e36000f576968dbcb2081def956c83fad6f40acd46f96" +checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.18", ] [[package]] @@ -1137,6 +1203,12 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + [[package]] name = "cmake" version = "0.1.48" @@ -1156,6 +1228,12 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "columnation" version = "0.1.0" @@ -1318,7 +1396,7 @@ dependencies = [ "atty", "cast", "ciborium", - "clap", + "clap 3.2.25", "criterion-plot", "futures", "itertools", @@ -2678,6 +2756,18 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +[[package]] +name = "is-terminal" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.48.0", +] + [[package]] name = "itertools" version = "0.10.5" @@ -3361,7 +3451,7 @@ version = "0.1.0" dependencies = [ "anyhow", "axum", - "clap", + "clap 4.3.10", "dirs", "indicatif", "mz-build-info", @@ -3603,7 +3693,7 @@ dependencies = [ "anyhow", "async-trait", "bytesize", - "clap", + "clap 4.3.10", "crossbeam-channel", "dec", "differential-dataflow", @@ -3672,7 +3762,7 @@ version = "0.58.0-dev" dependencies = [ "anyhow", "axum", - "clap", + "clap 4.3.10", "fail", "futures", "mz-alloc", @@ -3706,7 +3796,7 @@ dependencies = [ "anyhow", "async-trait", "bytesize", - "clap", + "clap 4.3.10", "crossbeam-channel", "dec", "differential-dataflow", @@ -3831,7 +3921,7 @@ dependencies = [ "bytesize", "cc", "chrono", - "clap", + "clap 4.3.10", "datadriven", "fail", "fallible-iterator", @@ -4065,7 +4155,7 @@ dependencies = [ "anyhow", "byteorder", "chrono", - "clap", + "clap 4.3.10", "criterion", "differential-dataflow", "itertools", @@ -4095,7 +4185,7 @@ version = "0.0.0" dependencies = [ "anyhow", "chrono", - "clap", + "clap 4.3.10", "crossbeam", "mz-avro", "mz-ccsr", @@ -4202,7 +4292,7 @@ dependencies = [ "anyhow", "async-trait", "chrono", - "clap", + "clap 4.3.10", "fail", "futures", "k8s-openapi", @@ -4254,7 +4344,7 @@ version = "0.0.0" dependencies = [ "anyhow", "async-trait", - "clap", + "clap 4.3.10", "futures-core", "http", "humantime", @@ -4279,7 +4369,7 @@ dependencies = [ "atty", "bytes", "chrono", - "clap", + "clap 4.3.10", "console-subscriber", "ctor", "either", @@ -4370,7 +4460,7 @@ dependencies = [ "async-trait", "axum", "bytes", - "clap", + "clap 4.3.10", "criterion", "datadriven", "differential-dataflow", @@ -4472,7 +4562,7 @@ version = "0.0.0" dependencies = [ "anyhow", "bytes", - "clap", + "clap 4.3.10", "datadriven", "fallible-iterator", "mz-ore", @@ -4697,7 +4787,7 @@ dependencies = [ "aws-config", "aws-sdk-s3", "bytefmt", - "clap", + "clap 4.3.10", "futures", "indicatif", "mz-aws-s3-util", @@ -4738,7 +4828,7 @@ dependencies = [ "anyhow", "async-stream", "async-trait", - "clap", + "clap 4.3.10", "crossbeam-channel", "futures", "http", @@ -4848,7 +4938,7 @@ dependencies = [ "anyhow", "bytes", "chrono", - "clap", + "clap 4.3.10", "fallible-iterator", "futures", "itertools", @@ -4948,7 +5038,7 @@ name = "mz-stash-debug" version = "0.28.0-dev" dependencies = [ "anyhow", - "clap", + "clap 4.3.10", "mz-adapter", "mz-build-info", "mz-ore", @@ -4977,7 +5067,7 @@ dependencies = [ "bytes", "bytesize", "chrono", - "clap", + "clap 4.3.10", "crossbeam-channel", "csv-core", "datadriven", @@ -5153,7 +5243,7 @@ dependencies = [ "byteorder", "bytes", "chrono", - "clap", + "clap 4.3.10", "flate2", "futures", "globset", @@ -6116,30 +6206,6 @@ dependencies = [ "toml", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.107", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro-hack" version = "0.5.19" @@ -8240,6 +8306,12 @@ name = "utf8parse" version = "0.2.0" source = "git+https://github.com/MaterializeInc/vte?rev=45670c47cebd7af050def2f80a307bdeec7caba3#45670c47cebd7af050def2f80a307bdeec7caba3" +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "uuid" version = "1.2.2" @@ -8281,7 +8353,7 @@ version = "0.10.1" source = "git+https://github.com/MaterializeInc/vte?rev=45670c47cebd7af050def2f80a307bdeec7caba3#45670c47cebd7af050def2f80a307bdeec7caba3" dependencies = [ "arrayvec", - "utf8parse", + "utf8parse 0.2.0", "vte_generate_state_changes", ] @@ -8621,7 +8693,7 @@ dependencies = [ "bytes", "cc", "chrono", - "clap", + "clap 4.3.10", "console", "criterion", "crossbeam-channel", diff --git a/src/cluster/Cargo.toml b/src/cluster/Cargo.toml index 84227964a651b..20a3067f63589 100644 --- a/src/cluster/Cargo.toml +++ b/src/cluster/Cargo.toml @@ -10,7 +10,7 @@ publish = false anyhow = "1.0.66" async-trait = "0.1.68" bytesize = "1.1.0" -clap = { version = "3.2.24", features = ["derive", "env"] } +clap = { version = "4.3.10", features = ["derive", "env"] } crossbeam-channel = "0.5.8" dec = { version = "0.4.8", features = ["serde"] } differential-dataflow = "0.12.0" diff --git a/src/clusterd/Cargo.toml b/src/clusterd/Cargo.toml index 61f4b90d19eb1..676d9abeaf780 100644 --- a/src/clusterd/Cargo.toml +++ b/src/clusterd/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] anyhow = "1.0.66" axum = "0.6.7" -clap = { version = "3.2.24", features = ["derive", "env"] } +clap = { version = "4.3.10", features = ["derive", "env"] } fail = { version = "0.5.1", features = ["failpoints"] } futures = "0.3.25" mz-alloc = { path = "../alloc" } diff --git a/src/compute/Cargo.toml b/src/compute/Cargo.toml index 7fa561d8adb62..d34b7e3b4c0a6 100644 --- a/src/compute/Cargo.toml +++ b/src/compute/Cargo.toml @@ -11,7 +11,7 @@ ahash = { version = "0.8.0", default_features = false } anyhow = "1.0.66" async-trait = "0.1.68" bytesize = "1.1.0" -clap = { version = "3.2.24", features = ["derive", "env"] } +clap = { version = "4.3.10", features = ["derive", "env"] } crossbeam-channel = "0.5.8" dec = { version = "0.4.8", features = ["serde"] } differential-dataflow = "0.12.0" diff --git a/src/environmentd/Cargo.toml b/src/environmentd/Cargo.toml index 6062f70a633ee..4f4b1020f8a01 100644 --- a/src/environmentd/Cargo.toml +++ b/src/environmentd/Cargo.toml @@ -17,7 +17,7 @@ base64 = "0.13.1" bytes = "1.3.0" bytesize = "1.1.0" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.24", features = ["wrap_help", "env", "derive"] } +clap = { version = "4.3.10", features = ["wrap_help", "env", "derive"] } fail = { version = "0.5.1", features = ["failpoints"] } futures = "0.3.25" headers = "0.3.8" diff --git a/src/interchange/Cargo.toml b/src/interchange/Cargo.toml index 162734b891f90..8e8fce01a025f 100644 --- a/src/interchange/Cargo.toml +++ b/src/interchange/Cargo.toml @@ -15,7 +15,7 @@ harness = false anyhow = "1.0.66" byteorder = "1.4.3" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.24", features = ["derive"] } +clap = { version = "4.3.10", features = ["derive"] } differential-dataflow = "0.12.0" itertools = "0.10.5" once_cell = "1.16.0" diff --git a/src/kafka-util/Cargo.toml b/src/kafka-util/Cargo.toml index ab325af448cae..efe3c586c0b7d 100644 --- a/src/kafka-util/Cargo.toml +++ b/src/kafka-util/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] anyhow = "1.0.66" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.24", features = ["derive"] } +clap = { version = "4.3.10", features = ["derive"] } crossbeam = "0.8.2" mz-avro = { path = "../avro" } mz-ccsr = { path = "../ccsr" } diff --git a/src/mz/Cargo.toml b/src/mz/Cargo.toml index b401999e0bfed..f54f9bcd9d98c 100644 --- a/src/mz/Cargo.toml +++ b/src/mz/Cargo.toml @@ -9,7 +9,7 @@ rust-version.workspace = true [dependencies] anyhow = "1.0.66" axum = { version = "0.6.7" } -clap = { version = "3.2.24", features = [ "derive" ] } +clap = { version = "4.3.10", features = [ "derive" ] } dirs = "5.0.0" indicatif = "0.17.2" mz-build-info = { path = "../build-info" } diff --git a/src/orchestrator-kubernetes/Cargo.toml b/src/orchestrator-kubernetes/Cargo.toml index 18a74232dc837..a87a175c3fa0d 100644 --- a/src/orchestrator-kubernetes/Cargo.toml +++ b/src/orchestrator-kubernetes/Cargo.toml @@ -10,7 +10,7 @@ publish = false anyhow = "1.0.66" async-trait = "0.1.68" chrono = { version = "0.4.23", default-features = false } -clap = { version = "3.2.24", features = ["derive"] } +clap = { version = "4.3.10", features = ["derive"] } fail = { version = "0.5.1", features = ["failpoints"] } futures = "0.3.25" maplit = "1.0.2" diff --git a/src/orchestrator-tracing/Cargo.toml b/src/orchestrator-tracing/Cargo.toml index fdb8f9b96d76d..372a3bf32fc6a 100644 --- a/src/orchestrator-tracing/Cargo.toml +++ b/src/orchestrator-tracing/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] anyhow = "1.0.66" async-trait = "0.1.68" -clap = { version = "3.2.24", features = ["env", "derive"] } +clap = { version = "4.3.10", features = ["env", "derive"] } futures-core = "0.3.21" http = "0.2.8" humantime = { version = "2.1.0", optional = true } diff --git a/src/ore/Cargo.toml b/src/ore/Cargo.toml index bbe2f6baf8800..213672996d0c4 100644 --- a/src/ore/Cargo.toml +++ b/src/ore/Cargo.toml @@ -18,7 +18,7 @@ anyhow = { version = "1.0.66", optional = true } async-trait = { version = "0.1.68", optional = true } bytes = { version = "1.3.0", optional = true } chrono = { version = "0.4.23", default-features = false, features = ["std"], optional = true } -clap = { version = "3.2.24", features = ["env"], optional = true } +clap = { version = "4.3.10", features = ["env"], optional = true } ctor = { version = "0.1.26", optional = true } either = "1.8.0" futures = { version = "0.3.25", optional = true } diff --git a/src/persist-client/Cargo.toml b/src/persist-client/Cargo.toml index 8f3d24a442b48..eb740eee987c0 100644 --- a/src/persist-client/Cargo.toml +++ b/src/persist-client/Cargo.toml @@ -33,7 +33,7 @@ anyhow = { version = "1.0.66", features = ["backtrace"] } async-stream = "0.3.3" async-trait = "0.1.68" bytes = { version = "1.3.0", features = ["serde"] } -clap = { version = "3.2.24", features = [ "derive" ] } +clap = { version = "4.3.10", features = [ "derive" ] } differential-dataflow = "0.12.0" futures = "0.3.25" futures-util = "0.3" @@ -67,7 +67,7 @@ tokio-console = ["mz-ore/tokio-console"] [dev-dependencies] async-trait = "0.1.68" axum = { version = "0.6.7" } -clap = { version = "3.2.24", features = ["derive", "env"] } +clap = { version = "4.3.10", features = ["derive", "env"] } criterion = { version = "0.4.0", features = ["html_reports"] } datadriven = { version = "0.6.0", features = ["async"] } futures-task = "0.3.21" diff --git a/src/pgtest/Cargo.toml b/src/pgtest/Cargo.toml index 9a2bc85c6ca67..67b8debfa2600 100644 --- a/src/pgtest/Cargo.toml +++ b/src/pgtest/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] anyhow = "1.0.66" bytes = "1.3.0" -clap = { version = "3.2.24", features = ["derive"] } +clap = { version = "4.3.10", features = ["derive"] } datadriven = "0.6.0" fallible-iterator = "0.2.0" mz-ore = { path = "../ore", features = ["cli"] } diff --git a/src/s3-datagen/Cargo.toml b/src/s3-datagen/Cargo.toml index e10adae824cb5..5875657e430dd 100644 --- a/src/s3-datagen/Cargo.toml +++ b/src/s3-datagen/Cargo.toml @@ -11,7 +11,7 @@ anyhow = "1.0.66" aws-config = { version = "0.55", default-features = false, features = ["native-tls"] } aws-sdk-s3 = { version = "0.26", default-features = false, features = ["native-tls", "rt-tokio"] } bytefmt = "0.1.7" -clap = { version = "3.2.24", features = ["derive"] } +clap = { version = "4.3.10", features = ["derive"] } futures = "0.3.25" indicatif = "0.17.2" mz-aws-s3-util = { path = "../aws-s3-util" } diff --git a/src/service/Cargo.toml b/src/service/Cargo.toml index 53bf37136d839..a09fcde4e84ba 100644 --- a/src/service/Cargo.toml +++ b/src/service/Cargo.toml @@ -10,7 +10,7 @@ publish = false anyhow = "1.0.66" async-stream = "0.3.3" async-trait = "0.1.68" -clap = { version = "3.2.24", features = ["env", "derive"] } +clap = { version = "4.3.10", features = ["env", "derive"] } crossbeam-channel = "0.5.8" futures = "0.3.25" http = "0.2.8" diff --git a/src/sqllogictest/Cargo.toml b/src/sqllogictest/Cargo.toml index 775cc7257ef6b..221278967e05f 100644 --- a/src/sqllogictest/Cargo.toml +++ b/src/sqllogictest/Cargo.toml @@ -10,7 +10,7 @@ publish = false anyhow = "1.0.66" bytes = "1.3.0" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.24", features = ["derive"] } +clap = { version = "4.3.10", features = ["derive"] } fallible-iterator = "0.2.0" futures = "0.3.25" itertools = "0.10.5" diff --git a/src/stash-debug/Cargo.toml b/src/stash-debug/Cargo.toml index 723c23dd643a9..9ea24c1959ce0 100644 --- a/src/stash-debug/Cargo.toml +++ b/src/stash-debug/Cargo.toml @@ -8,7 +8,7 @@ publish = false [dependencies] anyhow = "1.0.66" -clap = { version = "3.2.24", features = ["derive", "env"] } +clap = { version = "4.3.10", features = ["derive", "env"] } mz-adapter = { path = "../adapter" } mz-build-info = { path = "../build-info" } mz-ore = { path = "../ore" } diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml index c63657fe1941e..e8a17ae50e118 100644 --- a/src/storage/Cargo.toml +++ b/src/storage/Cargo.toml @@ -18,7 +18,7 @@ bytes = { version = "1.3.0", features = ["serde"] } bytesize = "1.1.0" bincode = "1" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.24", features = ["derive", "env"] } +clap = { version = "4.3.10", features = ["derive", "env"] } crossbeam-channel = "0.5.8" csv-core = { version = "0.1.10" } dec = "0.4.8" @@ -85,7 +85,7 @@ tonic-build = "0.8.2" [dev-dependencies] async-trait = "0.1.68" axum = { version = "0.6.7" } -clap = { version = "3.2.24", features = ["derive", "env"] } +clap = { version = "4.3.10", features = ["derive", "env"] } datadriven = { version = "0.6.0", features = ["async"] } humantime = "2.1.0" mz-http-util = { path = "../http-util" } diff --git a/src/testdrive/Cargo.toml b/src/testdrive/Cargo.toml index 98d4ef785152a..65bfa12f695a9 100644 --- a/src/testdrive/Cargo.toml +++ b/src/testdrive/Cargo.toml @@ -18,7 +18,7 @@ aws-types = "0.55" byteorder = "1.4.3" bytes = "1.3.0" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.24", features = ["derive"] } +clap = { version = "4.3.10", features = ["derive"] } flate2 = "1.0.24" futures = "0.3.25" globset = "0.4.9" diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index 01dfbe610ebc4..994782e0d71bf 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -26,7 +26,7 @@ bstr = { version = "0.2.14" } byteorder = { version = "1.4.3" } bytes = { version = "1.3.0", features = ["serde"] } chrono = { version = "0.4.25", default-features = false, features = ["alloc", "clock", "serde"] } -clap = { version = "3.2.24", features = ["derive", "env", "wrap_help"] } +clap = { version = "4.3.10", features = ["derive", "env", "wrap_help"] } console = { version = "0.15.5", default-features = false, features = ["ansi-parsing", "unicode-width"] } criterion = { version = "0.4.0", features = ["async_tokio", "html_reports"] } crossbeam-channel = { version = "0.5.8" } @@ -126,7 +126,7 @@ byteorder = { version = "1.4.3" } bytes = { version = "1.3.0", features = ["serde"] } cc = { version = "1.0.78", default-features = false, features = ["parallel"] } chrono = { version = "0.4.25", default-features = false, features = ["alloc", "clock", "serde"] } -clap = { version = "3.2.24", features = ["derive", "env", "wrap_help"] } +clap = { version = "4.3.10", features = ["derive", "env", "wrap_help"] } console = { version = "0.15.5", default-features = false, features = ["ansi-parsing", "unicode-width"] } criterion = { version = "0.4.0", features = ["async_tokio", "html_reports"] } crossbeam-channel = { version = "0.5.8" }