From a82f3287f87b8af757540fc741657b46ec9ac916 Mon Sep 17 00:00:00 2001 From: wu Date: Wed, 13 Sep 2023 16:39:30 +0800 Subject: [PATCH] chore: bump `jsonschema-transpiler` version (#12267) --- Cargo.lock | 153 ++++++++++----------------------------- src/connector/Cargo.toml | 14 +++- 2 files changed, 49 insertions(+), 118 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2a6f0b1a2f443..1069bd493b209 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -98,15 +98,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi", -] - [[package]] name = "anstream" version = "0.5.0" @@ -532,17 +523,6 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "auto_enums" version = "0.8.2" @@ -1570,21 +1550,6 @@ dependencies = [ "libloading", ] -[[package]] -name = "clap" -version = "2.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim 0.7.0", - "textwrap", - "unicode-width", - "vec_map", -] - [[package]] name = "clap" version = "4.4.2" @@ -1604,7 +1569,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.10.0", + "strsim", ] [[package]] @@ -1780,7 +1745,7 @@ dependencies = [ "crossbeam-utils", "futures", "hdrhistogram", - "humantime 2.1.0", + "humantime", "prost-types", "serde", "serde_json", @@ -1922,7 +1887,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.4.2", + "clap", "criterion-plot", "futures", "is-terminal", @@ -2203,7 +2168,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", + "strsim", "syn 1.0.109", ] @@ -2217,7 +2182,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", + "strsim", "syn 1.0.109", ] @@ -2231,7 +2196,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", + "strsim", "syn 2.0.32", ] @@ -2599,12 +2564,12 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.6.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "atty", - "humantime 1.3.0", + "humantime", + "is-terminal", "log", "regex", "termcolor", @@ -3428,15 +3393,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.3.2" @@ -3518,15 +3474,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" -[[package]] -name = "humantime" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] - [[package]] name = "humantime" version = "2.1.0" @@ -3794,7 +3741,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi", "libc", "windows-sys 0.48.0", ] @@ -3811,7 +3758,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi", "rustix 0.38.11", "windows-sys 0.48.0", ] @@ -3901,12 +3848,11 @@ dependencies = [ [[package]] name = "jsonschema-transpiler" version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40dc049cde84638e2a5657f45a4c74f471a4ecf2a8e2aa0b8ea899d5b1ebdee9" +source = "git+https://github.com/mozilla/jsonschema-transpiler?rev=c1a89d720d118843d8bcca51084deb0ed223e4b4#c1a89d720d118843d8bcca51084deb0ed223e4b4" dependencies = [ - "clap 2.32.0", + "clap", "env_logger", - "heck 0.3.3", + "heck 0.4.1", "log", "maplit", "regex", @@ -4073,7 +4019,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d8de370f98a6cb8a4606618e53e802f93b094ddec0f96988eaec2c27e6e9ce7" dependencies = [ - "clap 4.4.2", + "clap", "termcolor", "threadpool", ] @@ -4893,7 +4839,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi", "libc", ] @@ -6464,7 +6410,7 @@ version = "1.1.0-alpha" dependencies = [ "anyhow", "chrono", - "clap 4.4.2", + "clap", "console", "fs-err", "glob", @@ -6492,7 +6438,7 @@ name = "risedev-config" version = "1.1.0-alpha" dependencies = [ "anyhow", - "clap 4.4.2", + "clap", "console", "dialoguer", "enum-iterator", @@ -6524,7 +6470,7 @@ dependencies = [ name = "risingwave_backup_cmd" version = "1.1.0-alpha" dependencies = [ - "clap 4.4.2", + "clap", "madsim-tokio", "prometheus", "risingwave_backup", @@ -6587,7 +6533,7 @@ dependencies = [ "bcc", "bytes", "bytesize", - "clap 4.4.2", + "clap", "futures", "hdrhistogram", "itertools 0.11.0", @@ -6613,7 +6559,7 @@ dependencies = [ name = "risingwave_cmd" version = "1.1.0-alpha" dependencies = [ - "clap 4.4.2", + "clap", "madsim-tokio", "prometheus", "risingwave_common", @@ -6634,7 +6580,7 @@ name = "risingwave_cmd_all" version = "1.1.0-alpha" dependencies = [ "anyhow", - "clap 4.4.2", + "clap", "console", "const-str", "expect-test", @@ -6676,7 +6622,7 @@ dependencies = [ "bytes", "chrono", "chrono-tz", - "clap 4.4.2", + "clap", "comfy-table", "crc32fast", "criterion", @@ -6692,7 +6638,7 @@ dependencies = [ "hex", "http", "http-body", - "humantime 2.1.0", + "humantime", "hyper", "hytra", "itertools 0.11.0", @@ -6790,7 +6736,7 @@ dependencies = [ "anyhow", "async-trait", "bytes", - "clap 4.4.2", + "clap", "futures", "madsim-tokio", "prometheus", @@ -6816,7 +6762,7 @@ dependencies = [ "anyhow", "async-trait", "await-tree", - "clap 4.4.2", + "clap", "madsim-tokio", "madsim-tonic", "parking_lot 0.12.1", @@ -6841,7 +6787,7 @@ dependencies = [ "async-trait", "await-tree", "chrono", - "clap 4.4.2", + "clap", "either", "futures", "futures-async-stream", @@ -6960,7 +6906,7 @@ dependencies = [ "anyhow", "bytes", "chrono", - "clap 4.4.2", + "clap", "comfy-table", "futures", "inquire", @@ -6993,7 +6939,7 @@ version = "1.1.0-alpha" dependencies = [ "anyhow", "chrono", - "clap 4.4.2", + "clap", "madsim-tokio", "pg_interval", "rust_decimal", @@ -7072,7 +7018,7 @@ dependencies = [ "auto_enums", "bk-tree", "bytes", - "clap 4.4.2", + "clap", "downcast-rs", "dyn-clone", "easy-ext", @@ -7145,7 +7091,7 @@ version = "1.1.0-alpha" dependencies = [ "async-trait", "bytes", - "clap 4.4.2", + "clap", "criterion", "expect-test", "fail", @@ -7240,7 +7186,7 @@ dependencies = [ "aws-sdk-ec2", "axum", "bytes", - "clap 4.4.2", + "clap", "crepe", "easy-ext", "either", @@ -7363,7 +7309,7 @@ name = "risingwave_regress_test" version = "1.1.0-alpha" dependencies = [ "anyhow", - "clap 4.4.2", + "clap", "madsim-tokio", "path-absolutize", "similar", @@ -7435,7 +7381,7 @@ dependencies = [ "anyhow", "async-trait", "cfg-or-panic", - "clap 4.4.2", + "clap", "console", "futures", "glob", @@ -7530,7 +7476,7 @@ version = "1.1.0-alpha" dependencies = [ "anyhow", "chrono", - "clap 4.4.2", + "clap", "expect-test", "itertools 0.11.0", "libtest-mimic", @@ -7555,7 +7501,7 @@ name = "risingwave_state_cleaning_test" version = "1.1.0-alpha" dependencies = [ "anyhow", - "clap 4.4.2", + "clap", "futures", "madsim-tokio", "prometheus", @@ -8667,7 +8613,7 @@ dependencies = [ "fs-err", "futures", "glob", - "humantime 2.1.0", + "humantime", "itertools 0.11.0", "libtest-mimic", "md-5", @@ -8708,12 +8654,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "strsim" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550" - [[package]] name = "strsim" version = "0.10.0" @@ -8923,15 +8863,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" -[[package]] -name = "textwrap" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6" -dependencies = [ - "unicode-width", -] - [[package]] name = "thiserror" version = "1.0.48" @@ -9681,12 +9612,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "vergen" version = "8.2.5" @@ -10100,7 +10025,7 @@ dependencies = [ "bytes", "cc", "chrono", - "clap 4.4.2", + "clap", "clap_builder", "combine", "crossbeam-epoch", diff --git a/src/connector/Cargo.toml b/src/connector/Cargo.toml index c834452352f5f..6b0aebf4b0f18 100644 --- a/src/connector/Cargo.toml +++ b/src/connector/Cargo.toml @@ -41,7 +41,9 @@ chrono = { version = "0.4", default-features = false, features = [ "clock", "std", ] } -clickhouse = { git = "https://github.com/risingwavelabs/clickhouse.rs", rev = "622501c1c98c80baaf578c716d6903dde947804e", features = ["time"] } +clickhouse = { git = "https://github.com/risingwavelabs/clickhouse.rs", rev = "622501c1c98c80baaf578c716d6903dde947804e", features = [ + "time", +] } csv = "1.2" duration-str = "0.5.1" enum-as-inner = "0.6" @@ -54,11 +56,15 @@ hyper-tls = "0.5" icelake = { workspace = true } itertools = "0.11" jni = { version = "0.21.1", features = ["invocation"] } -jsonschema-transpiler = "1.10.0" +jsonschema-transpiler = { git = "https://github.com/mozilla/jsonschema-transpiler", rev = "c1a89d720d118843d8bcca51084deb0ed223e4b4" } maplit = "1.0.2" moka = { version = "0.11", features = ["future"] } -mysql_async = { version = "0.32", default-features = false, features = ["default"] } -mysql_common = { version = "0.30", default-features = false, features = ["chrono"] } +mysql_async = { version = "0.32", default-features = false, features = [ + "default", +] } +mysql_common = { version = "0.30", default-features = false, features = [ + "chrono", +] } nexmark = { version = "0.2", features = ["serde"] } num-bigint = "0.4" opendal = "0.39"