From 0cc28b5e04743c097e1eb825fb57cd5523038523 Mon Sep 17 00:00:00 2001 From: Sean Loiselle Date: Sun, 11 Dec 2022 09:44:58 -0500 Subject: [PATCH 1/2] sql: suggest using jsonb version of json functions --- src/sql/src/func.rs | 10 ++++++---- src/sql/src/plan/query.rs | 18 +++++++++++++++++- test/sqllogictest/cockroach/aggregate.slt | 14 +++++++------- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/sql/src/func.rs b/src/sql/src/func.rs index ed56b2394d426..d360267b5bf2a 100644 --- a/src/sql/src/func.rs +++ b/src/sql/src/func.rs @@ -1066,7 +1066,12 @@ where .collect(); let context = match (spec, types.as_slice()) { (FuncSpec::Func(name), _) => { - format!("Cannot call function {}({})", name, types.join(", ")) + let r = format!("Cannot call function {}({})", name, types.join(", ")); + if name.item.starts_with("json_") { + format!("{}\nUsing the jsonb version of the function might work", r) + } else { + r + } } (FuncSpec::Op(name), [typ]) => format!("no overload for {} {}", name, typ), (FuncSpec::Op(name), [ltyp, rtyp]) => { @@ -2504,9 +2509,6 @@ pub static PG_CATALOG_BUILTINS: Lazy> = Lazy::new(|| params!(TimestampTz) => AggregateFunc::MinTimestampTz, 2143; params!(Numeric) => AggregateFunc::MinNumeric, oid::FUNC_MIN_NUMERIC_OID; }, - "json_agg" => Aggregate { - params!(Any) => Operation::unary(|_ecx, _e| bail_unsupported!("json_agg")) => Jsonb, 3175; - }, "jsonb_agg" => Aggregate { params!(Any) => Operation::unary_ordered(|ecx, e, order_by| { // TODO(#7572): remove this diff --git a/src/sql/src/plan/query.rs b/src/sql/src/plan/query.rs index 36fd0b9b0b242..5b9b8958557b3 100644 --- a/src/sql/src/plan/query.rs +++ b/src/sql/src/plan/query.rs @@ -4366,7 +4366,23 @@ pub fn resolve_func( }) .collect(); - sql_bail!("function {}({}) does not exist", name, types.join(", ")) + let e = format!("function {}({}) does not exist", name, types.join(", ")); + + // Suggest using the `jsonb_` version of `json_` functions if they exist. + let e = match name.0.split_last() { + Some((i, q)) if i.as_str().starts_with("json_") => { + let mut jsonb_version = q.to_vec(); + jsonb_version.push(Ident::new(i.as_str().replace("json_", "jsonb_"))); + let jsonb_version = UnresolvedObjectName(jsonb_version); + match resolve_func(ecx, &jsonb_version, args) { + Ok(_) => format!("{}\nHINT: try using {}", e, jsonb_version), + Err(_) => e, + } + } + _ => e, + }; + + sql_bail!("{}", e) } fn plan_is_expr<'a>( diff --git a/test/sqllogictest/cockroach/aggregate.slt b/test/sqllogictest/cockroach/aggregate.slt index cb4961adf4c0a..6c75345933aff 100644 --- a/test/sqllogictest/cockroach/aggregate.slt +++ b/test/sqllogictest/cockroach/aggregate.slt @@ -47,7 +47,7 @@ SELECT array_agg(1) FROM kv ---- NULL -statement error supported +statement error does not exist SELECT json_agg(1) FROM kv ---- NULL @@ -77,7 +77,7 @@ SELECT array_agg(v) FROM kv ---- NULL -statement error supported +statement error does not exist SELECT json_agg(v) FROM kv ---- NULL @@ -99,7 +99,7 @@ SELECT array_agg(1) ---- {1} -statement error supported +statement error does not exist SELECT json_agg(1) query T @@ -114,7 +114,7 @@ SELECT count(NULL) ---- 0 -statement error supported +statement error does not exist SELECT json_agg(NULL) query T @@ -186,7 +186,7 @@ SELECT array_agg(1) FROM kv ---- {1,1,1,1,1,1} -statement error supported +statement error does not exist SELECT json_agg(1) FROM kv query T @@ -596,7 +596,7 @@ SELECT array_agg(s) FROM kv WHERE s IS NULL ---- {NULL} -query error supported +query error does not exist SELECT json_agg(s) FROM kv WHERE s IS NULL query T @@ -898,7 +898,7 @@ SELECT bool_and(b), bool_or(b) FROM bools query error concat_agg not yet supported SELECT concat_agg(s) FROM (SELECT s FROM kv ORDER BY k) -query error json_agg not yet supported +query error does not exist SELECT json_agg(s) FROM (SELECT s FROM kv ORDER BY k) # This is arguably wrong--we don't respect the inner ORDER BY--because we don't From f0f9f00d41b14d4dda1baeb1861f9f9a2e3dd750 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 11 Dec 2022 14:47:38 +0000 Subject: [PATCH 2/2] build(deps): bump clap from 3.2.20 to 4.0.29 Bumps [clap](https://github.com/clap-rs/clap) from 3.2.20 to 4.0.29. - [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.20...v4.0.29) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Cargo.lock | 151 +++++++++++++++++++------ src/billing-demo/Cargo.toml | 2 +- src/compute/Cargo.toml | 2 +- src/environmentd/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 | 2 +- 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 | 2 +- src/testdrive/Cargo.toml | 2 +- test/perf-kinesis/Cargo.toml | 2 +- 18 files changed, 131 insertions(+), 54 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 53896a844ccc7..776cbe9f253b7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -266,7 +266,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.6", "libc", "winapi", ] @@ -1073,27 +1073,37 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.20" +version = "3.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd" +checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" dependencies = [ - "atty", "bitflags", - "clap_derive", - "clap_lex", + "clap_lex 0.2.2", "indexmap", + "textwrap", +] + +[[package]] +name = "clap" +version = "4.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d" +dependencies = [ + "bitflags", + "clap_derive", + "clap_lex 0.3.0", + "is-terminal", "once_cell", "strsim", "termcolor", - "terminal_size", - "textwrap", + "terminal_size 0.2.3", ] [[package]] name = "clap_derive" -version = "3.2.18" +version = "4.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" dependencies = [ "heck", "proc-macro-error", @@ -1111,6 +1121,15 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "clap_lex" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" +dependencies = [ + "os_str_bytes", +] + [[package]] name = "cmake" version = "0.1.48" @@ -1167,7 +1186,7 @@ dependencies = [ "encode_unicode", "libc", "once_cell", - "terminal_size", + "terminal_size 0.1.17", "unicode-width", "winapi", ] @@ -1318,7 +1337,7 @@ dependencies = [ "atty", "cast", "ciborium", - "clap", + "clap 3.2.23", "criterion-plot", "futures", "itertools", @@ -2391,6 +2410,15 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + [[package]] name = "hex" version = "0.4.3" @@ -2632,12 +2660,34 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" +[[package]] +name = "io-lifetimes" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +dependencies = [ + "libc", + "windows-sys", +] + [[package]] name = "ipnet" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +[[package]] +name = "is-terminal" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330" +dependencies = [ + "hermit-abi 0.2.6", + "io-lifetimes 1.0.3", + "rustix 0.36.5", + "windows-sys", +] + [[package]] name = "itertools" version = "0.10.5" @@ -3035,6 +3085,12 @@ version = "0.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" +[[package]] +name = "linux-raw-sys" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" + [[package]] name = "lock_api" version = "0.4.6" @@ -3273,7 +3329,7 @@ version = "0.0.0" dependencies = [ "anyhow", "axum", - "clap", + "clap 4.0.29", "dirs", "indicatif", "mz-ore", @@ -3401,7 +3457,7 @@ version = "0.0.0" dependencies = [ "anyhow", "chrono", - "clap", + "clap 4.0.29", "hex", "mz-ore", "mz-test-util", @@ -3478,7 +3534,7 @@ dependencies = [ "async-trait", "axum", "bytesize", - "clap", + "clap 4.0.29", "crossbeam-channel", "dec", "differential-dataflow", @@ -3585,7 +3641,7 @@ dependencies = [ "bytes", "cc", "chrono", - "clap", + "clap 4.0.29", "datadriven", "fail", "fallible-iterator", @@ -3793,7 +3849,7 @@ version = "0.0.0" dependencies = [ "anyhow", "chrono", - "clap", + "clap 4.0.29", "crossbeam", "mz-avro", "mz-ccsr", @@ -3901,7 +3957,7 @@ dependencies = [ "anyhow", "async-trait", "chrono", - "clap", + "clap 4.0.29", "fail", "futures", "k8s-openapi", @@ -3948,7 +4004,7 @@ version = "0.0.0" dependencies = [ "anyhow", "async-trait", - "clap", + "clap 4.0.29", "futures-core", "http", "humantime", @@ -3969,7 +4025,7 @@ dependencies = [ "atty", "bytes", "chrono", - "clap", + "clap 4.0.29", "console-subscriber", "ctor", "either", @@ -4009,7 +4065,7 @@ dependencies = [ "aws-sdk-kinesis", "aws-types", "bytes", - "clap", + "clap 4.0.29", "futures", "mz-kinesis-util", "mz-ore", @@ -4071,7 +4127,7 @@ dependencies = [ "async-trait", "axum", "bytes", - "clap", + "clap 4.0.29", "criterion", "datadriven", "differential-dataflow", @@ -4142,7 +4198,7 @@ version = "0.0.0" dependencies = [ "anyhow", "bytes", - "clap", + "clap 4.0.29", "datadriven", "fallible-iterator", "mz-ore", @@ -4321,7 +4377,7 @@ dependencies = [ "aws-config", "aws-sdk-s3", "bytefmt", - "clap", + "clap 4.0.29", "futures", "indicatif", "mz-ore", @@ -4358,7 +4414,7 @@ dependencies = [ "anyhow", "async-stream", "async-trait", - "clap", + "clap 4.0.29", "crossbeam-channel", "futures", "http", @@ -4454,7 +4510,7 @@ dependencies = [ "anyhow", "bytes", "chrono", - "clap", + "clap 4.0.29", "fallible-iterator", "futures", "itertools", @@ -4532,7 +4588,7 @@ name = "mz-stash-debug" version = "0.28.0-dev" dependencies = [ "anyhow", - "clap", + "clap 4.0.29", "mz-adapter", "mz-build-info", "mz-ore", @@ -4560,7 +4616,7 @@ dependencies = [ "axum", "bytesize", "chrono", - "clap", + "clap 4.0.29", "crossbeam-channel", "csv-core", "datadriven", @@ -4707,7 +4763,7 @@ dependencies = [ "byteorder", "bytes", "chrono", - "clap", + "clap 4.0.29", "flate2", "futures", "globset", @@ -4972,7 +5028,7 @@ version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.6", "libc", ] @@ -5664,7 +5720,7 @@ dependencies = [ "byteorder", "hex", "lazy_static", - "rustix", + "rustix 0.35.13", ] [[package]] @@ -6138,9 +6194,23 @@ checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" dependencies = [ "bitflags", "errno", - "io-lifetimes", + "io-lifetimes 0.7.5", "libc", - "linux-raw-sys", + "linux-raw-sys 0.0.46", + "windows-sys", +] + +[[package]] +name = "rustix" +version = "0.36.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes 1.0.3", + "libc", + "linux-raw-sys 0.1.3", "windows-sys", ] @@ -6862,14 +6932,21 @@ dependencies = [ ] [[package]] -name = "textwrap" -version = "0.15.0" +name = "terminal_size" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" +checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907" dependencies = [ - "terminal_size", + "rustix 0.36.5", + "windows-sys", ] +[[package]] +name = "textwrap" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" + [[package]] name = "thiserror" version = "1.0.37" diff --git a/src/billing-demo/Cargo.toml b/src/billing-demo/Cargo.toml index 98384f1df83f5..d5ca7a5bb9bc0 100644 --- a/src/billing-demo/Cargo.toml +++ b/src/billing-demo/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.20", features = ["derive"] } +clap = { version = "4.0.29", features = ["derive"] } hex = "0.4.3" mz-ore = { path = "../../src/ore", features = ["cli", "async"] } mz-test-util = { path = "../../test/test-util" } diff --git a/src/compute/Cargo.toml b/src/compute/Cargo.toml index 7849333b846de..73906415fa6c8 100644 --- a/src/compute/Cargo.toml +++ b/src/compute/Cargo.toml @@ -11,7 +11,7 @@ anyhow = "1.0.66" async-trait = "0.1.59" axum = "0.5.17" bytesize = "1.1.0" -clap = { version = "3.2.20", features = ["derive", "env"] } +clap = { version = "4.0.29", features = ["derive", "env"] } crossbeam-channel = "0.5.6" dec = { version = "0.4.8", features = ["serde"] } differential-dataflow = { git = "https://github.com/TimelyDataflow/differential-dataflow.git" } diff --git a/src/environmentd/Cargo.toml b/src/environmentd/Cargo.toml index 6f72c8612d7e5..fc50c7ecb188b 100644 --- a/src/environmentd/Cargo.toml +++ b/src/environmentd/Cargo.toml @@ -16,7 +16,7 @@ axum = { version = "0.5.17", features = ["headers"] } base64 = "0.13.1" bytes = "1.2.1" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.20", features = ["wrap_help", "env", "derive"] } +clap = { version = "4.0.29", features = ["wrap_help", "env", "derive"] } fail = { version = "0.5.1", features = ["failpoints"] } futures = "0.3.25" headers = "0.3.8" diff --git a/src/kafka-util/Cargo.toml b/src/kafka-util/Cargo.toml index 1929ec82b0bf7..58c966fd0ba98 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.20", features = ["derive"] } +clap = { version = "4.0.29", 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 5199ecdcdc91e..d8f21873676f0 100644 --- a/src/mz/Cargo.toml +++ b/src/mz/Cargo.toml @@ -10,7 +10,7 @@ publish = false [dependencies] anyhow = "1.0.66" axum = "0.5.17" -clap = { version = "3.2.20", features = [ "derive" ] } +clap = { version = "4.0.29", features = [ "derive" ] } dirs = "4.0.0" indicatif = "0.17.2" mz-ore = { path = "../ore", features = ["async"] } diff --git a/src/orchestrator-kubernetes/Cargo.toml b/src/orchestrator-kubernetes/Cargo.toml index 9e0b114bd194f..3f425cf0efcb5 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.59" chrono = { version = "0.4.23", default-features = false } -clap = { version = "3.2.20", features = ["derive"] } +clap = { version = "4.0.29", 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 6bd4c4c6078cb..b8ead179b1087 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.59" -clap = { version = "3.2.20", features = ["env", "derive"] } +clap = { version = "4.0.29", 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 6790eba9116e1..ddb2d4afa522f 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.59", optional = true } bytes = { version = "1.2.1", optional = true } chrono = { version = "0.4.23", default-features = false, features = ["std"], optional = true } -clap = { version = "3.2.20", features = ["env"], optional = true } +clap = { version = "4.0.29", 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 eb86dcdac36cb..9ba0efc2afec1 100644 --- a/src/persist-client/Cargo.toml +++ b/src/persist-client/Cargo.toml @@ -60,7 +60,7 @@ tokio-console = ["mz-ore/tokio-console"] [dev-dependencies] async-trait = "0.1.59" axum = "0.5.17" -clap = { version = "3.2.20", features = ["derive", "env"] } +clap = { version = "4.0.29", 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 146086392cd26..b6c2a8a211d1b 100644 --- a/src/pgtest/Cargo.toml +++ b/src/pgtest/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] anyhow = "1.0.66" bytes = "1.2.1" -clap = { version = "3.2.20", features = ["derive"] } +clap = { version = "4.0.29", 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 900bcebd50a2b..a62c9b8a30206 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.51.0", default-features = false, features = ["native-tls"] } aws-sdk-s3 = { version = "0.21.0", default-features = false, features = ["native-tls", "rt-tokio"] } bytefmt = "0.1.7" -clap = { version = "3.2.20", features = ["derive"] } +clap = { version = "4.0.29", features = ["derive"] } futures = "0.3.25" indicatif = "0.17.2" mz-ore = { path = "../ore", features = ["cli"] } diff --git a/src/service/Cargo.toml b/src/service/Cargo.toml index d745d844e4a8b..abe18c1f40a83 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.59" -clap = { version = "3.2.20", features = ["env", "derive"] } +clap = { version = "4.0.29", features = ["env", "derive"] } crossbeam-channel = "0.5.6" futures = "0.3.25" http = "0.2.8" diff --git a/src/sqllogictest/Cargo.toml b/src/sqllogictest/Cargo.toml index 53aaf50334f55..7ebff08b1364c 100644 --- a/src/sqllogictest/Cargo.toml +++ b/src/sqllogictest/Cargo.toml @@ -10,7 +10,7 @@ publish = false anyhow = "1.0.66" bytes = "1.2.1" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.20", features = ["derive"] } +clap = { version = "4.0.29", 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 b653a33c74537..5d3a70778013a 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.20", features = ["derive", "env"] } +clap = { version = "4.0.29", 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 82c6ecaf22d61..fb551964a8949 100644 --- a/src/storage/Cargo.toml +++ b/src/storage/Cargo.toml @@ -17,7 +17,7 @@ aws-sdk-sqs = { version = "0.21.0", default-features = false, features = ["nativ axum = "0.5.17" bytesize = "1.1.0" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.20", features = ["derive", "env"] } +clap = { version = "4.0.29", features = ["derive", "env"] } crossbeam-channel = { version = "0.5.6" } csv-core = { version = "0.1.10" } dec = "0.4.8" diff --git a/src/testdrive/Cargo.toml b/src/testdrive/Cargo.toml index 04c3d4d0abbe6..8e5ea42f9f8c1 100644 --- a/src/testdrive/Cargo.toml +++ b/src/testdrive/Cargo.toml @@ -21,7 +21,7 @@ aws-types = { version = "0.51.0", features = ["hardcoded-credentials"] } byteorder = "1.4.3" bytes = "1.2.1" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.20", features = ["derive"] } +clap = { version = "4.0.29", features = ["derive"] } flate2 = "1.0.24" futures = "0.3.25" globset = "0.4.9" diff --git a/test/perf-kinesis/Cargo.toml b/test/perf-kinesis/Cargo.toml index e5f518826456e..a3e1c223b4766 100644 --- a/test/perf-kinesis/Cargo.toml +++ b/test/perf-kinesis/Cargo.toml @@ -12,7 +12,7 @@ aws-config = { version = "0.51.0", default-features = false, features = ["native aws-sdk-kinesis = { version = "0.21.0", default-features = false, features = ["native-tls", "rt-tokio"] } aws-types = "0.51.0" bytes = "1.2.1" -clap = { version = "3.2.20", features = ["derive"] } +clap = { version = "4.0.29", features = ["derive"] } futures = "0.3.25" mz-kinesis-util = { path = "../../src/kinesis-util" } mz-ore = { path = "../../src/ore", features = ["async"] }