diff --git a/Cargo.lock b/Cargo.lock index 936b1fa599bb4..f78cf5100607f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -54,9 +54,9 @@ dependencies = [ [[package]] name = "anyerror" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0eff878df53fcffe838345abfa5b3d7eeb87e856f53b7461e0e5d51fb9d045" +checksum = "9ad463f35c2858e54959324c3bc6c076a1f159f53b4ac402658a65ee863180a5" dependencies = [ "anyhow", "backtrace", @@ -66,9 +66,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.52" +version = "1.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3" +checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" [[package]] name = "arbitrary" @@ -284,7 +284,7 @@ checksum = "83137067e3a2a6a06d67168e49e68a0957d215410473a740cea95a2425c0b7c6" dependencies = [ "async-io", "blocking", - "cfg-if 1.0.0", + "cfg-if", "event-listener", "futures-lite", "libc", @@ -410,11 +410,12 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "aws-config" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a5421955d4744207053bef13a65cc60af6cd1e9ad0ff447bd5e630d1edddd72" +checksum = "12b964849038df43a2b4e0c20e29b67451af5a93108d757dd58b9e82f41a0ee8" dependencies = [ "aws-http", + "aws-sdk-sso", "aws-sdk-sts", "aws-smithy-async", "aws-smithy-client", @@ -424,18 +425,21 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", + "hex", "http", "hyper", + "ring", "tokio", "tower", "tracing", + "zeroize", ] [[package]] name = "aws-endpoint" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c45bafccabcc4953bd71015ae187c3fe85dec2960aef1c2cf5515c867c0fbd54" +checksum = "06d059b181b25940b751e8efecc173ceb4fe65f45d8975f56b02e98db5c42fd6" dependencies = [ "aws-smithy-http", "aws-types", @@ -446,9 +450,9 @@ dependencies = [ [[package]] name = "aws-http" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad5cd76c37a16219dc6f73474f1cd1603872b6f5e6a765df7ef5a2000c6dcd8" +checksum = "3049066e3282c98bbf01e90459a1772ccf6c0b96cd1483c3dd5aa34bef9b9de1" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -461,9 +465,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4c9685f0e30ffb9043cd4aa1302a77289a30f1837f3d3f265decf089fccfb2" +checksum = "7d70be50ac07c3c2b5f37056271856ac00190e80c19c76c58bcbee5be0b63ec9" dependencies = [ "aws-endpoint", "aws-http", @@ -484,11 +488,33 @@ dependencies = [ "tower", ] +[[package]] +name = "aws-sdk-sso" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222fcabbf95f1f13c4e28cab95c9a4bb02606f998b1ea2800713b6866be5701d" +dependencies = [ + "aws-endpoint", + "aws-http", + "aws-sig-auth", + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-http-tower", + "aws-smithy-json", + "aws-smithy-types", + "aws-types", + "bytes", + "http", + "tokio-stream", + "tower", +] + [[package]] name = "aws-sdk-sts" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4e4397ce5e2b21bda02db9b4ed4642f0717b5fe6dd2c276d364a019734108e3" +checksum = "d85b9f081af2c73ee25642de1a35fa9ba7b2432e54f6bf42242e478ae53c3beb" dependencies = [ "aws-endpoint", "aws-http", @@ -508,9 +534,9 @@ dependencies = [ [[package]] name = "aws-sig-auth" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446fbc7a132042271fc363a442b0f97e6036e71a6f55c535ca5cf2062b73aece" +checksum = "4012b5192350b5403aba19a01a5a3b1768158dab936c4269d89760970d4812bc" dependencies = [ "aws-sigv4", "aws-smithy-eventstream", @@ -523,9 +549,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c60fde70ec639a20e30b2ea425619a72242e5fff0b3a8ac7f729d07b847deb3" +checksum = "41f4b9c0c3a34e5152a0cd5e43b8f2cfd780e3bd7a245948d8787e051095ac4c" dependencies = [ "aws-smithy-eventstream", "aws-smithy-http", @@ -543,9 +569,9 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "0.34.1" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce0f12c49772b774e2d65b579d09c205948ea8679b2b39d08d1ae9476bb535d" +checksum = "b69dad0aefb1b64e63e0d3a1310dc50191608d8c9e226f2f241f344a7173642e" dependencies = [ "futures-util", "pin-project-lite", @@ -555,9 +581,9 @@ dependencies = [ [[package]] name = "aws-smithy-client" -version = "0.34.1" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42212ca483db4774b1cbadf648be4a06dc45dec0ecfd552506a63c98ea4e2838" +checksum = "93e47a8aca2194672518d6630936507d3b54598c482f13ffe53f9b7932724bbb" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -579,9 +605,9 @@ dependencies = [ [[package]] name = "aws-smithy-eventstream" -version = "0.34.1" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2340a513c3956459d5b0238976847aa94ab8c9efc9a26f1d91fe5178c6fbc2f9" +checksum = "f98bcfcb063d29c7cc7bb0a64830afe606090de75533c10a11a05460d814e8d9" dependencies = [ "aws-smithy-types", "bytes", @@ -590,9 +616,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.34.1" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "009e7ddec00dfe28a5eb1d6749342d274aa05c2fddb3b8abf82429fd060544c9" +checksum = "1c8bbe92ecdc4e39a612359b09994c45d000591d4951aa7343443f44b47e6696" dependencies = [ "aws-smithy-eventstream", "aws-smithy-types", @@ -611,9 +637,9 @@ dependencies = [ [[package]] name = "aws-smithy-http-tower" -version = "0.34.1" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0317649bd8f4b0fc0e1721b3bbe878af6352926a89b5d2cfb4211d5fe8342c75" +checksum = "f23fdf1253855af3bb4abb25e42ad3152a71241af89014eebf27c14c7a59b81d" dependencies = [ "aws-smithy-http", "bytes", @@ -626,18 +652,18 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.34.1" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c858f5049c12eb77ea1b9624c8463d41bbefa9e8e8c3159ce4565e8e3b27ce" +checksum = "3cc19c372b0a561aa6bfc5dfdd917da7c7b1641d3bc9049ca4d7b197bb616a09" dependencies = [ "aws-smithy-types", ] [[package]] name = "aws-smithy-query" -version = "0.34.1" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77b94596aef43e18fed1e5370aa9dac9c402b28441fc56577b00b757b3fb001b" +checksum = "8254e49a237e9dc0301a4683c424a825f4220420b241ec4eb51e959a70626d8a" dependencies = [ "aws-smithy-types", "urlencoding", @@ -645,9 +671,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "0.34.1" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d9ea9658f2576b4e91c6b00c4963a68614daf74b5160a66daa02c9f897da3ae" +checksum = "cde96306a54777ec8781aa510830e242de614aa5746274713f5ecac0779f644f" dependencies = [ "itoa 1.0.1", "num-integer", @@ -657,9 +683,9 @@ dependencies = [ [[package]] name = "aws-smithy-xml" -version = "0.34.1" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db1bbd22e96540cf8809a9137bf627e28e5bc6b365ab1ac58d9d81649b31def1" +checksum = "e3b0466594a86074a6e96b11284f9a9ddc90c5c5b7d6144ab357a90be49d28c4" dependencies = [ "thiserror", "xmlparser", @@ -667,9 +693,9 @@ dependencies = [ [[package]] name = "aws-types" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490a491f7592e110762a305970a3c88b6a5bd662bde27f3b2f2ab7be6b8f1589" +checksum = "433fd128ea727e9b83b34c72c6d4db1b900f067760fa27b387694fe896633142" dependencies = [ "aws-smithy-async", "aws-smithy-types", @@ -765,13 +791,13 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6" +checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide", "object", @@ -821,7 +847,7 @@ dependencies = [ "async-std", "async-trait", "byte-unit", - "clap 3.0.7", + "clap 3.0.14", "clap_complete", "colored", "comfy-table", @@ -856,7 +882,7 @@ dependencies = [ "serde_json", "serde_yaml", "sha2 0.10.1", - "sysinfo 0.22.5", + "sysinfo", "tar", "tempfile", "thiserror", @@ -973,14 +999,14 @@ dependencies = [ [[package]] name = "blake3" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "882e99e4a0cb2ae6cb6e442102e8e6b7131718d94110e64c3e6a34ea9b106f37" +checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" dependencies = [ "arrayref", "arrayvec 0.7.2", "cc", - "cfg-if 1.0.0", + "cfg-if", "constant_time_eq", "digest 0.10.1", ] @@ -1189,12 +1215,6 @@ dependencies = [ "nom 5.1.2", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -1271,9 +1291,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.0.7" +version = "3.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12e8611f9ae4e068fa3e56931fded356ff745e70987ff76924a6e0ab1c8ef2e3" +checksum = "b63edc3f163b3c71ec8aa23f9bd6070f77edbf3d1d198b164afa90ff00e4ec62" dependencies = [ "atty", "bitflags", @@ -1288,11 +1308,11 @@ dependencies = [ [[package]] name = "clap_complete" -version = "3.0.4" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d044e9db8cd0f68191becdeb5246b7462e4cf0c069b19ae00d1bf3fa9889498d" +checksum = "678db4c39c013cc68b54d372bce2efc58e30a0337c497c9032fd196802df3bc3" dependencies = [ - "clap 3.0.7", + "clap 3.0.14", ] [[package]] @@ -1323,8 +1343,8 @@ dependencies = [ "lazy_static", "log", "lz4", - "naive-cityhash", - "parking_lot", + "naive-cityhash 0.1.0", + "parking_lot 0.11.2", "pin-project-lite", "rand", "slab", @@ -1501,7 +1521,7 @@ dependencies = [ "hostname", "log", "lz4", - "naive-cityhash", + "naive-cityhash 0.2.0", "native-tls", "once_cell", "pin-project", @@ -1679,7 +1699,7 @@ dependencies = [ "rand", "serde", "serde_json", - "sha1", + "sha1 0.10.0", "sha2 0.10.1", "sqlparser", "strength_reduce", @@ -1712,7 +1732,7 @@ dependencies = [ name = "common-infallible" version = "0.1.0" dependencies = [ - "parking_lot", + "parking_lot 0.12.0", ] [[package]] @@ -1763,7 +1783,7 @@ dependencies = [ "common-base", "common-infallible", "common-macros", - "parking_lot", + "parking_lot 0.12.0", "tikv-jemalloc-sys", ] @@ -1833,7 +1853,7 @@ dependencies = [ "anyhow", "async-trait", "bytes", - "clap 3.0.7", + "clap 3.0.14", "common-arrow", "common-base", "common-exception", @@ -1892,7 +1912,7 @@ dependencies = [ "prost", "serde", "serde_json", - "sha1", + "sha1 0.10.0", "sha2 0.10.1", "thiserror", "tonic", @@ -1911,6 +1931,7 @@ dependencies = [ "once_cell", "prometheus-parse", "serde", + "tokio", ] [[package]] @@ -1993,9 +2014,9 @@ dependencies = [ [[package]] name = "console-api" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "033fddce299c93dd44ae21d5f5a6e749baa5d103784bcdde65701c07272a9fde" +checksum = "cc347c19eb5b940f396ac155822caee6662f850d97306890ac3773ed76c90c5a" dependencies = [ "prost", "prost-types", @@ -2006,11 +2027,12 @@ dependencies = [ [[package]] name = "console-subscriber" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2380cc150266375aeda8f9aeadc5527395c1a8807ecf9fa97a46d1bb760ec5b" +checksum = "829835c211a0247cd11e65e13cec8696b879374879c35ce162ce8098b23c90d4" dependencies = [ "console-api", + "crossbeam-channel", "futures", "hdrhistogram", "humantime", @@ -2065,7 +2087,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -2079,11 +2101,11 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836" +checksum = "a2209c310e29876f7f0b2721e7e26b84aff178aa3da5d091f9bfbf47669e60e3" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -2128,7 +2150,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -2142,7 +2164,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -2152,7 +2174,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] @@ -2163,7 +2185,7 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", "lazy_static", "memoffset", @@ -2172,11 +2194,11 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b979d76c9fcb84dffc80a73f7290da0f83e4c95773494674cb44b76d13a7a110" +checksum = "4dd435b205a4842da59efd07628f921c096bc1cc0a156835b4fa0bcb9a19bcce" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -2186,7 +2208,7 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "lazy_static", ] @@ -2200,7 +2222,7 @@ dependencies = [ "crossterm_winapi", "libc", "mio 0.7.14", - "parking_lot", + "parking_lot 0.11.2", "signal-hook", "signal-hook-mio", "winapi", @@ -2272,7 +2294,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c19b33b32fd48f83388821bd8f534b59e1b1ffd5c6c83771d1b23abd3dac2685" dependencies = [ "bstr", - "cfg-if 1.0.0", + "cfg-if", "csv-core", "futures", "itoa 1.0.1", @@ -2355,16 +2377,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "dashmap" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" -dependencies = [ - "cfg-if 1.0.0", - "num_cpus", -] - [[package]] name = "data-encoding" version = "2.3.2" @@ -2375,7 +2387,7 @@ checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" name = "databend-benchmark" version = "0.1.0" dependencies = [ - "clap 3.0.7", + "clap 3.0.14", "clickhouse-driver", "common-base", "common-exception", @@ -2407,7 +2419,7 @@ dependencies = [ "async-trait", "backtrace", "byteorder", - "clap 3.0.7", + "clap 3.0.14", "common-arrow", "common-base", "common-building", @@ -2473,7 +2485,7 @@ dependencies = [ "cargo_metadata", "chrono", "chrono-tz", - "clap 3.0.7", + "clap 3.0.14", "clickhouse-driver", "common-arrow", "common-ast", @@ -2532,7 +2544,7 @@ dependencies = [ "rsa", "serde", "serde_json", - "sha1", + "sha1 0.10.0", "sha2 0.10.1", "sqlparser", "tempfile", @@ -2640,7 +2652,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "dirs-sys-next", ] @@ -2755,7 +2767,7 @@ version = "0.8.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -2882,9 +2894,9 @@ version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a16910e685088843d53132b04e0f10a571fdb193224fc589685b3ba1ce4cb03d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "windows-sys", + "windows-sys 0.28.0", ] [[package]] @@ -2903,7 +2915,7 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "winapi", @@ -2950,7 +2962,7 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crc32fast", "libc", "libz-sys", @@ -3102,9 +3114,9 @@ checksum = "1847abb9cb65d566acd5942e94aea9c8f547ad02c98e1649326fc0e8910b8b1e" [[package]] name = "futures" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4" +checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" dependencies = [ "futures-channel", "futures-core", @@ -3117,9 +3129,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b" +checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" dependencies = [ "futures-core", "futures-sink", @@ -3127,15 +3139,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7" +checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" [[package]] name = "futures-executor" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a" +checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" dependencies = [ "futures-core", "futures-task", @@ -3144,9 +3156,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2" +checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" [[package]] name = "futures-lite" @@ -3165,9 +3177,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c" +checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" dependencies = [ "proc-macro2", "quote", @@ -3176,21 +3188,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508" +checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" [[package]] name = "futures-task" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72" +checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" [[package]] name = "futures-util" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164" +checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" dependencies = [ "futures-channel", "futures-core", @@ -3248,7 +3260,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "libc", "wasi", @@ -3374,9 +3386,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "handlebars" -version = "4.2.0" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2483bce82dd3ed52509d0117e4a30a488bd608be250ed7a0185301314239ed31" +checksum = "25546a65e5cf1f471f3438796fc634650b31d7fcde01d444c309aeb28b92e3a8" dependencies = [ "log", "pest", @@ -3416,9 +3428,9 @@ dependencies = [ [[package]] name = "headers" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c4eb0471fcb85846d8b0690695ef354f9afb11cb03cac2e1d7c9253351afb0" +checksum = "c84c647447a07ca16f5fbd05b633e535cc41a08d2d74ab1e08648df53be9cb89" dependencies = [ "base64 0.13.0", "bitflags", @@ -3755,15 +3767,9 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] -[[package]] -name = "integer-encoding" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dc51180a9b377fd75814d0cc02199c20f8e99433d6762f650d39cdbbd3b56f" - [[package]] name = "integer-encoding" version = "3.0.2" @@ -3911,7 +3917,7 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "903ae2481bcdfdb7b68e0a9baa4b7c9aff600b9ae2e8e5bb5833b8c91ab851ea" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "ecdsa", "elliptic-curve", "sha2 0.9.9", @@ -4060,9 +4066,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.112" +version = "0.2.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" +checksum = "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c" [[package]] name = "libgit2-sys" @@ -4082,7 +4088,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "winapi", ] @@ -4128,9 +4134,9 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" [[package]] name = "lock_api" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" +checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" dependencies = [ "scopeguard", ] @@ -4141,7 +4147,7 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "serde", "value-bag", ] @@ -4288,9 +4294,9 @@ dependencies = [ [[package]] name = "metrics" -version = "0.17.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55586aa936c35f34ba8aa5d97356d554311206e1ce1f9e68fe7b07288e5ad827" +checksum = "8f601807a248964869e222d209fd5f8e5bcc5542e4c9b1ef21bcee4424868ce5" dependencies = [ "ahash", "metrics-macros", @@ -4298,53 +4304,47 @@ dependencies = [ [[package]] name = "metrics-exporter-prometheus" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aee04ed06085ea4eb1e1378c4fd973d95e0d3e32897913cd58aedc3b10e71452" +checksum = "eb2da0a53ecf563b398350e3c1834ad27dd050eb47977472f2e654ccb39ff75f" dependencies = [ "hyper", + "indexmap", "ipnet", "metrics", "metrics-util", - "parking_lot", + "parking_lot 0.11.2", "quanta", "thiserror", "tokio", + "tracing", ] [[package]] name = "metrics-macros" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0daa0ab3a0ae956d0e2c1f42511422850e577d36a255357d1a7d08d45ee3a2f1" +checksum = "44128401debcab0d777da11d005419b4d6ad6da8cb5eea64487c34ee0a311cf5" dependencies = [ - "lazy_static", "proc-macro2", "quote", - "regex", "syn", ] [[package]] name = "metrics-util" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1174223789e331d9d47a4a953dac36e397db60fa8d2a111ac505388c6c7fe32e" +checksum = "eb8e50225c0fa6146fe721a6fa9c556acdfa2910f2120caff5b25b03362c7033" dependencies = [ - "ahash", - "aho-corasick", "atomic-shim", "crossbeam-epoch", "crossbeam-utils", - "dashmap", "hashbrown", - "indexmap", "metrics", "num_cpus", - "ordered-float 2.10.0", - "parking_lot", + "parking_lot 0.11.2", "quanta", - "radix_trie", "sketches-ddsketch", ] @@ -4421,7 +4421,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d4d70639a72f972725db16350db56da68266ca368b2a1fe26724a903ad3d6b8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "downcast", "fragile", "lazy_static", @@ -4436,7 +4436,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79ef208208a0dea3f72221e26e904cdc6db2e481d9ade89081ddd494f1dbaa6b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "proc-macro2", "quote", "syn", @@ -4562,7 +4562,7 @@ dependencies = [ "saturating", "serde", "serde_json", - "sha1", + "sha1 0.6.1", "sha2 0.9.9", "smallvec", "subprocess", @@ -4577,6 +4577,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e5641a0f564cf7c57a008d3ade6de749729f4eadf74e9222560c6a3a0d38cd2" +[[package]] +name = "naive-cityhash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fce7b49e1e6d8aa67232ef1c4c936c0af58756eb2db6f65c40bacb39035e7f42" + [[package]] name = "native-tls" version = "0.2.8" @@ -4618,7 +4624,7 @@ checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" dependencies = [ "bitflags", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "memoffset", ] @@ -4842,9 +4848,9 @@ dependencies = [ [[package]] name = "octocrab" -version = "0.15.3" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffcd640df5bcc834888f696001ab880ec1a75a5cb0d5ca46b3f1c91613ef4297" +checksum = "afcfecea7633fbd11141b7ce1cc4e49e01566570dd5d995ee1edb497dd340082" dependencies = [ "arc-swap", "async-trait", @@ -4896,7 +4902,7 @@ dependencies = [ "async-trait", "byte-unit", "bytes", - "clap 3.0.7", + "clap 3.0.14", "derive_more", "futures", "maplit", @@ -4915,7 +4921,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" dependencies = [ "bitflags", - "cfg-if 1.0.0", + "cfg-if", "foreign-types", "libc", "once_cell", @@ -4943,13 +4949,15 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf9b1c4e9a6c4de793c632496fa490bdc0e1eea73f0c91394f7b6990935d22" +checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" dependencies = [ "async-trait", "crossbeam-channel", - "futures", + "futures-channel", + "futures-executor", + "futures-util", "js-sys", "lazy_static", "percent-encoding", @@ -4962,9 +4970,9 @@ dependencies = [ [[package]] name = "opentelemetry-jaeger" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db22f492873ea037bc267b35a0e8e4fb846340058cb7c864efe3d0bf23684593" +checksum = "f8c0b12cd9e3f9b35b52f6e0dac66866c519b26f424f4bbf96e3fe8bfbdc5229" dependencies = [ "async-trait", "lazy_static", @@ -4977,9 +4985,9 @@ dependencies = [ [[package]] name = "opentelemetry-semantic-conventions" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffeac823339e8b0f27b961f4385057bf9f97f2863bc745bd015fd6091f2270e9" +checksum = "985cc35d832d412224b2cffe2f9194b1b89b6aa5d0bef76d080dce09d90e62bd" dependencies = [ "opentelemetry", ] @@ -5033,11 +5041,11 @@ dependencies = [ [[package]] name = "packed_simd_2" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71c0c06716cfc81616fa8e22b721ce92fecd594508bc0eb3d04ae3ef35ac10c5" +checksum = "defdcfef86dcc44ad208f71d9ff4ce28df6537a4e0d6b0e8e845cb8ca10059a6" dependencies = [ - "cfg-if 0.1.10", + "cfg-if", "libm 0.1.4", ] @@ -5055,7 +5063,17 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core", + "parking_lot_core 0.8.5", +] + +[[package]] +name = "parking_lot" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.0", ] [[package]] @@ -5064,7 +5082,7 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "instant", "libc", "redox_syscall", @@ -5072,6 +5090,19 @@ dependencies = [ "winapi", ] +[[package]] +name = "parking_lot_core" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2f4f894f3865f6c0e02810fc597300f34dc2510f66400da262d8ae10e75767d" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys 0.29.0", +] + [[package]] name = "parquet-format-async-temp" version = "0.2.0" @@ -5081,7 +5112,7 @@ dependencies = [ "async-trait", "byteorder", "futures", - "integer-encoding 3.0.2", + "integer-encoding", "ordered-float 1.1.1", ] @@ -5364,9 +5395,9 @@ dependencies = [ [[package]] name = "poem" -version = "1.2.36" +version = "1.2.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0d58e10ab7f28066b2f48a6d938896efe299b6d20728f29308be4ac0885f66f" +checksum = "3644551d7c91b980ed277647f16e7afadf3f9f0e24ef3b9f9ecc8d669246544a" dependencies = [ "async-trait", "bytes", @@ -5376,18 +5407,19 @@ dependencies = [ "hyper", "mime", "multer", - "parking_lot", + "parking_lot 0.11.2", "percent-encoding", "pin-project-lite", "poem-derive", "regex", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "smallvec", "thiserror", "tokio", - "tokio-rustls 0.22.0", + "tokio-rustls 0.23.2", "tokio-stream", "tokio-util", "tracing", @@ -5395,9 +5427,9 @@ dependencies = [ [[package]] name = "poem-derive" -version = "1.2.36" +version = "1.2.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff2b4d01de39ca6d30a2fde7b2d30d2c019fd0d3a7302ffaf71823f889fa3dc" +checksum = "c90bc5b98d8ed3822067d4664a2e9ba7ea3a7f2521bb55d7838009f1360fde62" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5411,7 +5443,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "log", "wepoll-ffi", @@ -5434,14 +5466,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55f35f865aa964be21fcde114cbd1cfbd9bf8a471460ed965b0f84f96c711401" dependencies = [ "backtrace", - "cfg-if 1.0.0", + "cfg-if", "findshlibs", "inferno", "lazy_static", "libc", "log", "nix", - "parking_lot", + "parking_lot 0.11.2", "prost", "prost-build", "prost-derive", @@ -5501,9 +5533,9 @@ dependencies = [ [[package]] name = "pretty_assertions" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0cfe1b2403f172ba0f234e500906ee0a3e493fb81092dac23ebefe129301cc" +checksum = "76d5b548b725018ab5496482b45cb8bef21e9fed1858a6d674e3a8a0f0bb5d50" dependencies = [ "ansi_term", "ctor", @@ -5669,9 +5701,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d" +checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" dependencies = [ "proc-macro2", ] @@ -6114,6 +6146,15 @@ dependencies = [ "security-framework", ] +[[package]] +name = "rustls-pemfile" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" +dependencies = [ + "base64 0.13.0", +] + [[package]] name = "rustversion" version = "1.0.6" @@ -6127,7 +6168,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db7826789c0e25614b03e5a54a0717a86f9ff6e6e5247f92b369472869320039" dependencies = [ "bitflags", - "cfg-if 1.0.0", + "cfg-if", "clipboard-win", "dirs-next", "fd-lock", @@ -6241,9 +6282,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.133" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" dependencies = [ "serde_derive", ] @@ -6272,9 +6313,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.133" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" dependencies = [ "proc-macro2", "quote", @@ -6283,9 +6324,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.75" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c059c05b48c5c0067d4b4b2b4f0732dd65feb52daf7e0ea09cd87e7dadc1af79" +checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085" dependencies = [ "indexmap", "itoa 1.0.1", @@ -6355,7 +6396,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ "block-buffer 0.9.0", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", @@ -6370,6 +6411,17 @@ dependencies = [ "sha1_smol", ] +[[package]] +name = "sha1" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04cc229fb94bcb689ffc39bd4ded842f6ff76885efede7c6d1ffb62582878bea" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.1", +] + [[package]] name = "sha1_smol" version = "1.0.0" @@ -6383,7 +6435,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", @@ -6395,7 +6447,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99c3bd8169c58782adad9290a9af5939994036b76187f7b4f0e6de91dbbfc0ec" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.10.1", ] @@ -6516,7 +6568,7 @@ dependencies = [ "im", "libc", "log", - "parking_lot", + "parking_lot 0.11.2", ] [[package]] @@ -6538,9 +6590,9 @@ checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" [[package]] name = "snafu" -version = "0.6.10" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab12d3c261b2308b0d80c26fffb58d17eba81a4be97890101f416b478c79ca7" +checksum = "2eba135d2c579aa65364522eb78590cdf703176ef71ad4c32b00f58f7afb2df5" dependencies = [ "backtrace", "doc-comment", @@ -6549,10 +6601,11 @@ dependencies = [ [[package]] name = "snafu-derive" -version = "0.6.10" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1508efa03c362e23817f96cde18abed596a25219a8b2c66e8db33c03543d315b" +checksum = "7a7fe9b0669ef117c5cabc5549638528f36771f058ff977d7689deb517833a75" dependencies = [ + "heck 0.3.3", "proc-macro2", "quote", "syn", @@ -6564,7 +6617,7 @@ version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "winapi", ] @@ -6661,7 +6714,7 @@ checksum = "923f0f39b6267d37d23ce71ae7235602134b250ace715dd2c90421998ddac0c6" dependencies = [ "lazy_static", "new_debug_unreachable", - "parking_lot", + "parking_lot 0.11.2", "phf_shared 0.8.0", "precomputed-hash", ] @@ -6761,9 +6814,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7" +checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" dependencies = [ "proc-macro2", "quote", @@ -6784,26 +6837,11 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.19.2" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e7de153d0438a648bb71e06e300e54fc641685e96af96d49b843f43172d341c" +checksum = "9e757000a4bed2b1be9be65a3f418b9696adf30bb419214c73997422de73a591" dependencies = [ - "cfg-if 1.0.0", - "core-foundation-sys", - "doc-comment", - "libc", - "ntapi", - "once_cell", - "winapi", -] - -[[package]] -name = "sysinfo" -version = "0.22.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f1bfab07306a27332451a662ca9c8156e3a9986f82660ba9c8e744fe8455d43" -dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "core-foundation-sys", "libc", "ntapi", @@ -6835,7 +6873,7 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fastrand", "libc", "redox_syscall", @@ -6934,12 +6972,12 @@ dependencies = [ [[package]] name = "thrift" -version = "0.13.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6d965454947cc7266d22716ebfd07b18d84ebaf35eec558586bbb2a8cb6b5b" +checksum = "b82ca8f46f95b3ce96081fe3dd89160fdea970c254bb72925255d1b62aae692e" dependencies = [ "byteorder", - "integer-encoding 1.1.7", + "integer-encoding", "log", "ordered-float 1.1.1", "threadpool", @@ -7013,9 +7051,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.15.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838" +checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a" dependencies = [ "bytes", "libc", @@ -7023,7 +7061,7 @@ dependencies = [ "mio 0.7.14", "num_cpus", "once_cell", - "parking_lot", + "parking_lot 0.11.2", "pin-project-lite", "signal-hook-registry", "tokio-macros", @@ -7200,11 +7238,11 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" +checksum = "2d8d93354fe2a8e50d5953f5ae2e47a3fc2ef03292e7ea46e3cc38f549525fb9" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -7224,9 +7262,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" +checksum = "8276d9a4a3a558d7b7ad5303ad50b53d58264641b82914b7ada36bd762e7a716" dependencies = [ "proc-macro2", "quote", @@ -7252,11 +7290,12 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" +checksum = "03cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23" dependencies = [ "lazy_static", + "valuable", ] [[package]] @@ -7284,9 +7323,9 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ffbf13a0f8b054a4e59df3a173b818e9c6177c02789871f2073977fd0062076" +checksum = "dff3ebfa73490b6d574ca747819b6bde3e8d006b58861f34cafa89898d91eb9c" dependencies = [ "opentelemetry", "tracing", @@ -7297,9 +7336,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77be66445c4eeebb934a7340f227bfe7b338173d3f8c00a60a5a58005c9faecf" +checksum = "74786ce43333fcf51efe947aed9718fbe46d5c7328ec3f1029e818083966d9aa" dependencies = [ "ansi_term", "lazy_static", @@ -7315,12 +7354,12 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0d7f5db438199a6e2609debe3f69f808d074e0a2888ee0bccb45fe234d03f4" +checksum = "ca94d4e9feb6a181c690c4040d7a24ef34018d8313ac5044a61d21222ae24e31" dependencies = [ "async-trait", - "cfg-if 1.0.0", + "cfg-if", "data-encoding", "enum-as-inner", "futures-channel", @@ -7340,17 +7379,17 @@ dependencies = [ [[package]] name = "trust-dns-resolver" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ad17b608a64bd0735e67bde16b0636f8aa8591f831a25d18443ed00a699770" +checksum = "ecae383baad9995efaa34ce8e57d12c3f305e545887472a492b838f4b5cfb77a" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "futures-util", "ipconfig", "lazy_static", "log", "lru-cache", - "parking_lot", + "parking_lot 0.11.2", "resolv-conf", "smallvec", "thiserror", @@ -7381,7 +7420,7 @@ version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "rand", "static_assertions", ] @@ -7565,6 +7604,12 @@ dependencies = [ "serde", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "value-bag" version = "1.0.0-alpha.8" @@ -7589,19 +7634,19 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "vergen" -version = "6.0.0" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd0c9f8387e118573859ae0e6c6fbdfa41bd1f4fbea451b0b8c5a81a3b8bc9e0" +checksum = "3893329bee75c101278e0234b646fa72221547d63f97fb66ac112a0569acd110" dependencies = [ "anyhow", - "cfg-if 1.0.0", + "cfg-if", "chrono", "enum-iterator", "getset", "git2", "rustc_version", "rustversion", - "sysinfo 0.19.2", + "sysinfo", "thiserror", ] @@ -7659,7 +7704,7 @@ version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] @@ -7684,7 +7729,7 @@ version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -7841,11 +7886,24 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82ca39602d5cbfa692c4b67e3bcbb2751477355141c1ed434c94da4186836ff6" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows_aarch64_msvc 0.28.0", + "windows_i686_gnu 0.28.0", + "windows_i686_msvc 0.28.0", + "windows_x86_64_gnu 0.28.0", + "windows_x86_64_msvc 0.28.0", +] + +[[package]] +name = "windows-sys" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ceb069ac8b2117d36924190469735767f0990833935ab430155e71a44bafe148" +dependencies = [ + "windows_aarch64_msvc 0.29.0", + "windows_i686_gnu 0.29.0", + "windows_i686_msvc 0.29.0", + "windows_x86_64_gnu 0.29.0", + "windows_x86_64_msvc 0.29.0", ] [[package]] @@ -7854,30 +7912,60 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52695a41e536859d5308cc613b4a022261a274390b25bd29dfff4bf08505f3c2" +[[package]] +name = "windows_aarch64_msvc" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d027175d00b01e0cbeb97d6ab6ebe03b12330a35786cbaca5252b1c4bf5d9b" + [[package]] name = "windows_i686_gnu" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f54725ac23affef038fecb177de6c9bf065787c2f432f79e3c373da92f3e1d8a" +[[package]] +name = "windows_i686_gnu" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8793f59f7b8e8b01eda1a652b2697d87b93097198ae85f823b969ca5b89bba58" + [[package]] name = "windows_i686_msvc" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d5158a43cc43623c0729d1ad6647e62fa384a3d135fd15108d37c683461f64" +[[package]] +name = "windows_i686_msvc" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8602f6c418b67024be2996c512f5f995de3ba417f4c75af68401ab8756796ae4" + [[package]] name = "windows_x86_64_gnu" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc31f409f565611535130cfe7ee8e6655d3fa99c1c61013981e491921b5ce954" +[[package]] +name = "windows_x86_64_gnu" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3d615f419543e0bd7d2b3323af0d86ff19cbc4f816e6453f36a2c2ce889c354" + [[package]] name = "windows_x86_64_msvc" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f2b8c7cbd3bfdddd9ab98769f9746a7fad1bca236554cd032b78d768bc0e89f" +[[package]] +name = "windows_x86_64_msvc" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11d95421d9ed3672c280884da53201a5c46b7b2765ca6faf34b0d71cf34a3561" + [[package]] name = "winreg" version = "0.6.2" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 32068a9e069be..adfb6dc9d0ad4 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -14,6 +14,8 @@ test = false [[bin]] name = "bendctl" path = "src/bin/bendctl.rs" +doctest = false +test = false [features] @@ -30,30 +32,30 @@ common-meta-raft-store = { path = "../common/meta/raft-store" } colored = "2.0.0" comfy-table = "5.0.0" dirs = "4.0.0" -clap = { version = "3.0.5", features = ["derive", "env"] } -clap_complete = "3.0.2" +clap = { version = "3.0.14", features = ["derive", "env"] } +clap_complete = "3.0.6" dyn-clone = "1.0.4" flate2 = "1.0.22" -handlebars = "4.2.0" +handlebars = "4.2.1" indicatif = "0.16.2" run_script = "0.9.0" rustyline = "9.1.2" -futures = "0.3.19" +futures = "0.3.21" byte-unit = "4.0.13" num-format = "0.4.0" fs_extra = "1.2.0" -serde = { version = "1.0.133", features = ["derive"] } -serde_json = "1.0.74" -sha2 = "0.10.0" -sysinfo = "0.22.4" +serde = { version = "1.0.136", features = ["derive"] } +serde_json = "1.0.78" +sha2 = "0.10.1" +sysinfo = "0.23.0" tar = "0.4.38" thiserror = "1.0.30" ureq = { version = "2.4.0", features = ["json"] } nix = "0.23.1" serde_yaml = "0.8.23" portpicker = "0.1.1" -reqwest = { version = "0.11.8", features = ["json", "native-tls", "multipart", "blocking", "tokio-rustls", "stream"] } -libc = "0.2.112" +reqwest = { version = "0.11.9", features = ["json", "native-tls", "multipart", "blocking", "tokio-rustls", "stream"] } +libc = "0.2.117" lexical-util = "0.8.1" async-trait = "0.1.52" webbrowser = "0.5.5" @@ -64,10 +66,10 @@ csv = "1.1.6" http = "0.2.6" [dev-dependencies] -tempfile = "3.2.0" -assert_cmd = "2.0.2" -predicates = "2.1.0" -httpmock = "0.6.5" +tempfile = "3.3.0" +assert_cmd = "2.0.4" +predicates = "2.1.1" +httpmock = "0.6.6" [build-dependencies] common-building = { path = "../common/building" } diff --git a/cli/src/cmds/clusters/create.rs b/cli/src/cmds/clusters/create.rs index d1488fce1a78e..7e43255615c3c 100644 --- a/cli/src/cmds/clusters/create.rs +++ b/cli/src/cmds/clusters/create.rs @@ -27,6 +27,7 @@ use clap::ValueHint; use databend_meta::configs::Config as MetaConfig; use databend_query::configs::Config as QueryConfig; use lexical_util::num::AsPrimitive; +use sysinfo::Pid; use sysinfo::ProcessExt; use sysinfo::System; use sysinfo::SystemExt; @@ -60,7 +61,7 @@ pub struct LocalBinaryPaths { async fn reconcile_local_meta(status: &mut Status) -> Result<()> { let s = System::new_all(); if let Some((_, meta)) = status.get_local_meta_config() { - if meta.pid.is_none() || s.process(meta.pid.unwrap()).is_none() { + if meta.pid.is_none() || s.process(Pid::from(meta.pid.unwrap())).is_none() { return Err(CliError::Unknown( "meta service process not found".to_string(), )); @@ -75,7 +76,7 @@ async fn reconcile_local_meta(status: &mut Status) -> Result<()> { async fn reconcile_local_query(status: &mut Status) -> Result<()> { let s = System::new_all(); for (_, query) in status.get_local_query_configs() { - if query.pid.is_none() || s.process(query.pid.unwrap()).is_none() { + if query.pid.is_none() || s.process(Pid::from(query.pid.unwrap())).is_none() { return Err(CliError::Unknown( "query service process not found".to_string(), )); @@ -646,13 +647,13 @@ impl CreateCommand { .await .expect("cannot stop current services"); let s = System::new_all(); - for elem in s.process_by_name("databend-meta") { + for elem in s.processes_by_name("databend-meta") { elem.kill(); } - for elem in s.process_by_name("databend-query") { + for elem in s.processes_by_name("databend-query") { elem.kill(); } - for elem in s.process_by_name("databend-dashboard") { + for elem in s.processes_by_name("databend-dashboard") { elem.kill(); } } @@ -674,14 +675,14 @@ impl CreateCommand { } let s = System::new_all(); - if !s.process_by_name("databend-meta").is_empty() { + if s.processes_by_name("databend-meta").count() != 0 { return Err(CliError::Unknown( "❗ have installed databend-meta process before, please stop them and retry" .parse() .unwrap(), )); } - if !s.process_by_name("databend-query").is_empty() { + if s.processes_by_name("databend-query").count() != 0 { return Err(CliError::Unknown( "❗ have installed databend-query process before, please stop them and retry" .parse() diff --git a/cli/src/cmds/clusters/view.rs b/cli/src/cmds/clusters/view.rs index 365654e1df8b7..abda617d94ba8 100644 --- a/cli/src/cmds/clusters/view.rs +++ b/cli/src/cmds/clusters/view.rs @@ -138,14 +138,14 @@ impl ViewCommand { } let s = System::new_all(); - if s.process_by_name("databend-meta").is_empty() { + if s.processes_by_name("databend-meta").count() == 0 { return Err(CliError::Unknown( "❗ cannot find existing meta service on local machine" .parse() .unwrap(), )); } - if s.process_by_name("databend-query").is_empty() { + if s.processes_by_name("databend-query").count() == 0 { return Err(CliError::Unknown( "❗ cannot find existing query service on local machine" .parse() diff --git a/cli/src/cmds/status.rs b/cli/src/cmds/status.rs index f56281e10ab96..4ca932386e9e1 100644 --- a/cli/src/cmds/status.rs +++ b/cli/src/cmds/status.rs @@ -35,6 +35,7 @@ use nix::unistd::Pid; use reqwest::Client; use serde::Deserialize; use serde::Serialize; +use sysinfo::Pid as SysPid; use sysinfo::System; use sysinfo::SystemExt; @@ -242,7 +243,7 @@ impl LocalRuntime for LocalDashboardConfig { } let s = System::new_all(); let pid = self.pid.unwrap(); - return s.process(pid).is_none(); + return s.process(SysPid::from(pid)).is_none(); } async fn verify(&self, _retries: Option, _duration: Option) -> Result<()> { @@ -374,7 +375,7 @@ impl LocalRuntime for LocalMetaConfig { )) .port(), ) - && s.process(pid).is_none(); + && s.process(SysPid::from(pid)).is_none(); } // retrieve the configured url for health check // TODO(zhihanz): http TLS endpoint @@ -533,7 +534,7 @@ impl LocalRuntime for LocalQueryConfig { let pid = self.pid.unwrap(); portpicker::is_free(self.config.query.mysql_handler_port) && portpicker::is_free(self.config.query.clickhouse_handler_port) - && s.process(pid).is_none() + && s.process(SysPid::from(pid)).is_none() } // retrieve the configured url for health check fn get_health_probe(&self) -> (reqwest::Client, String) { diff --git a/common/ast/Cargo.toml b/common/ast/Cargo.toml index e4abe1caef1a7..670aa327e5349 100644 --- a/common/ast/Cargo.toml +++ b/common/ast/Cargo.toml @@ -23,14 +23,14 @@ sqlparser = { git = "https://github.com/datafuse-extras/sqlparser-rs", rev = "c3 # Crates.io dependencies async-trait = "0.1.52" -logos = "0.12" -nom = "7" -nom-rule = "0.2" +logos = "0.12.0" +nom = "7.1.0" +nom-rule = "0.2.0" once_cell = "1.9.0" thiserror = "1.0.30" -pratt = "0.3" +pratt = "0.3.0" [dev-dependencies] -goldenfile = "1" -pretty_assertions = "1.0.0" +goldenfile = "1.1.0" +pretty_assertions = "1.1.0" common-base = { path = "../base" } diff --git a/common/base/Cargo.toml b/common/base/Cargo.toml index 976197173fe00..0a9d506fe88cc 100644 --- a/common/base/Cargo.toml +++ b/common/base/Cargo.toml @@ -23,9 +23,9 @@ common-exception = { path = "../exception" } # Crates.io dependencies async-trait = "0.1.52" ctrlc = { version = "3.2.1", features = ["termination"] } -futures = "0.3.19" +futures = "0.3.21" pprof = { version = "0.6.2", features = ["flamegraph", "protobuf"] } -tokio = { version = "1.15.0", features = ["macros", "rt", "rt-multi-thread", "sync", "fs", "signal"] } +tokio = { version = "1.16.1", features = ["full"] } uuid = { version = "0.8.2", features = ["serde", "v4"] } -serde = { version = "1.0.133", features = ["derive"] } -poem = { version = "1.2.27", features = ["rustls"] } +serde = { version = "1.0.136", features = ["derive"] } +poem = { version = "1.2.53", features = ["rustls"] } diff --git a/common/building/Cargo.toml b/common/building/Cargo.toml index 8a63207548515..c551aa28abb0b 100644 --- a/common/building/Cargo.toml +++ b/common/building/Cargo.toml @@ -11,5 +11,5 @@ doctest = false test = false [dependencies] -vergen = "6.0.0" +vergen = "6.0.2" run_script = "0.9.0" diff --git a/common/cache/Cargo.toml b/common/cache/Cargo.toml index 87abb6bd9f391..c62313b9c699d 100644 --- a/common/cache/Cargo.toml +++ b/common/cache/Cargo.toml @@ -31,4 +31,4 @@ walkdir = "2.3.2" heapsize_ = { package = "heapsize", version = "0.4.2", optional = true } [dev-dependencies] -tempfile = "3.2.0" +tempfile = "3.3.0" diff --git a/common/clickhouse-srv/Cargo.toml b/common/clickhouse-srv/Cargo.toml index df050ad05ed53..29c823b55f990 100644 --- a/common/clickhouse-srv/Cargo.toml +++ b/common/clickhouse-srv/Cargo.toml @@ -23,20 +23,20 @@ common-tracing = {path = "../tracing" } once_cell = "1.9.0" thiserror = "1.0.30" chrono-tz = "0.6.1" -futures = "0.3.19" -futures-core = "0.3.19" -futures-sink = "0.3.19" +futures = "0.3.21" +futures-core = "0.3.21" +futures-sink = "0.3.21" url= "2.2.2" byteorder = "1.4.3" hostname = "0.3.1" lz4 = "1.23.2" -combine = "4.6.2" +combine = "4.6.3" pin-project = "1.0.10" bytes = "1.1.0" uuid = "0.8.2" tokio-stream = "0.1.8" async-trait = "0.1.52" -naive-cityhash = "0.1.0" +naive-cityhash = "0.2.0" [dependencies.chrono] version = "0.4.19" @@ -44,9 +44,9 @@ default-features = false features = [ "std" ] [dependencies.tokio] -version = "1.15.0" +version = "1.16.1" default-features = false -features = ["io-util", "net", "sync", "rt-multi-thread", "macros"] +features = ["full"] optional = true [dependencies.tokio-util] @@ -54,7 +54,7 @@ version = "0.6.9" features = ["full"] [dependencies.futures-util] -version = "0.3.19" +version = "0.3.21" features = ["sink"] [dependencies.log] diff --git a/common/clickhouse-srv/src/lib.rs b/common/clickhouse-srv/src/lib.rs index d903658eb7667..f066e40856c2e 100644 --- a/common/clickhouse-srv/src/lib.rs +++ b/common/clickhouse-srv/src/lib.rs @@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +// https://github.com/rust-lang/rust-clippy/issues/8334 +#![allow(clippy::ptr_arg)] + use std::sync::Arc; use common_tracing::tracing; diff --git a/common/clickhouse-srv/src/types/column/factory.rs b/common/clickhouse-srv/src/types/column/factory.rs index a8972556270a1..47b8af3f5761b 100644 --- a/common/clickhouse-srv/src/types/column/factory.rs +++ b/common/clickhouse-srv/src/types/column/factory.rs @@ -293,13 +293,9 @@ pub fn parse_decimal(source: &str) -> Option<(u8, u8, NoBits)> { }; match nobits { - Some(_) => { - scale = (&source[params_indexes.0 + 1..params_indexes.1]) - .parse() - .ok() - } + Some(_) => scale = source[params_indexes.0 + 1..params_indexes.1].parse().ok(), None => { - for (idx, cell) in (&source[params_indexes.0 + 1..params_indexes.1]) + for (idx, cell) in source[params_indexes.0 + 1..params_indexes.1] .split(',') .map(|s| s.trim()) .enumerate() diff --git a/common/containers/Cargo.toml b/common/containers/Cargo.toml index eb3abae826b73..2f31fd9e1280d 100644 --- a/common/containers/Cargo.toml +++ b/common/containers/Cargo.toml @@ -17,4 +17,4 @@ common-tracing = {path = "../tracing"} async-trait = "0.1.52" [dev-dependencies] -anyhow = "1.0.52" +anyhow = "1.0.53" diff --git a/common/dal/Cargo.toml b/common/dal/Cargo.toml index a8c72fa084e9e..fa7c4f8161fc6 100644 --- a/common/dal/Cargo.toml +++ b/common/dal/Cargo.toml @@ -22,9 +22,9 @@ azure_core = { version = "0.1.0", git = "https://github.com/datafuse-extras/azur azure_storage = { version = "0.1.0", git = "https://github.com/datafuse-extras/azure-sdk-for-rust.git", rev = "b5bf36b" } azure_storage_blobs = { version = "0.1.0", git = "https://github.com/datafuse-extras/azure-sdk-for-rust.git", rev = "b5bf36b" } bytes = "1.1.0" -futures = "0.3.19" -metrics = "0.17.1" -reqwest = "0.11.8" +futures = "0.3.21" +metrics = "0.18.0" +reqwest = "0.11.9" rusoto_core = "0.47.0" rusoto_s3 = "0.47.0" rusoto_sts = "0.47.0" @@ -33,7 +33,7 @@ rusoto_credential = "0.47.0" [dev-dependencies] common-metrics = { path = "../metrics" } rand = "0.8.4" -tempfile = "3.2.0" +tempfile = "3.3.0" [features] # for unit test only diff --git a/common/dal2/Cargo.toml b/common/dal2/Cargo.toml index 3bbe6c8805de6..471f73d6ffd02 100644 --- a/common/dal2/Cargo.toml +++ b/common/dal2/Cargo.toml @@ -13,17 +13,17 @@ doctest = false async-compat = "0.2.1" async-trait = "0.1.52" bytes = "1.1.0" -futures = { version="0.3.19", features = ["alloc"]} -tokio = { version = "1.15.0", features = ["full"] } +futures = { version = "0.3.21", features = ["alloc"] } +tokio = { version = "1.16.1", features = ["full"] } thiserror = "1.0.30" -aws-config = "0.4.0" -aws-types = { version = "0.4.0", features = ["hardcoded-credentials"] } -aws-sdk-s3 = "0.4.0" -aws-endpoint = "0.4.0" +aws-config = "0.6.0" +aws-types = { version = "0.6.0", features = ["hardcoded-credentials"] } +aws-sdk-s3 = "0.6.0" +aws-endpoint = "0.6.0" http = "0.2.6" -aws-smithy-http = "0.34" -hyper = {version="0.14.16", features=["stream"]} +aws-smithy-http = "0.36.0" +hyper = { version = "0.14.16", features = ["stream"] } pin-project = "1.0.10" [dev-dependencies] -uuid = { version = "0.8", features = ["serde", "v4"] } +uuid = { version = "0.8.2", features = ["serde", "v4"] } diff --git a/common/datablocks/Cargo.toml b/common/datablocks/Cargo.toml index 6d1e1790235f5..02f203d53e386 100644 --- a/common/datablocks/Cargo.toml +++ b/common/datablocks/Cargo.toml @@ -26,4 +26,4 @@ comfy-table = "5.0.0" regex = "1.5.4" [dev-dependencies] -pretty_assertions = "1.0.0" +pretty_assertions = "1.1.0" diff --git a/common/datavalues/Cargo.toml b/common/datavalues/Cargo.toml index 6ca6ca6d7f9cb..9098c3f4f78bd 100644 --- a/common/datavalues/Cargo.toml +++ b/common/datavalues/Cargo.toml @@ -23,8 +23,8 @@ common-mem-allocator = { path = "../mem-allocator" } # Crates.io dependencies num = "0.4.0" ordered-float = "2.10.0" -serde = { version = "1.0.133", features = ["derive"] } -serde_json = "1.0.74" +serde = { version = "1.0.136", features = ["derive"] } +serde_json = "1.0.78" ahash = "0.7.6" strength_reduce = "0.2.3" lexical-core = "0.8.2" @@ -35,4 +35,4 @@ simdutf8 = "0.1.3" seahash = "4.1.0" [dev-dependencies] -pretty_assertions = "1.0.0" +pretty_assertions = "1.1.0" diff --git a/common/datavalues/src/data_schema.rs b/common/datavalues/src/data_schema.rs index 66aeaf7d961aa..8102201774b71 100644 --- a/common/datavalues/src/data_schema.rs +++ b/common/datavalues/src/data_schema.rs @@ -174,6 +174,7 @@ impl From<&ArrowSchema> for DataSchema { } } +#[allow(clippy::needless_borrow)] impl From for DataSchema { fn from(a_schema: ArrowSchema) -> Self { (&a_schema).into() diff --git a/common/datavalues/src/lib.rs b/common/datavalues/src/lib.rs index b1f311164375e..9efdc1eab6166 100644 --- a/common/datavalues/src/lib.rs +++ b/common/datavalues/src/lib.rs @@ -16,6 +16,9 @@ //! insipration for the crate* //! +// https://github.com/rust-lang/rust-clippy/issues/8334 +#![allow(clippy::ptr_arg)] + #[macro_use] mod macros; diff --git a/common/datavalues2/Cargo.toml b/common/datavalues2/Cargo.toml index b36baf7eedfec..ca39f23059dec 100644 --- a/common/datavalues2/Cargo.toml +++ b/common/datavalues2/Cargo.toml @@ -22,7 +22,7 @@ common-mem-allocator = { path = "../mem-allocator" } # Crates.io dependencies num = "0.4.0" -serde = { version = "1.0.133", features = ["derive"] } +serde = { version = "1.0.136", features = ["derive"] } lexical-core = "0.8.2" chrono = "0.4.19" chrono-tz = "0.6.1" @@ -31,4 +31,4 @@ typetag = "0.1.8" itertools = "0.10.3" [dev-dependencies] -pretty_assertions = "1.0.0" +pretty_assertions = "1.1.0" diff --git a/common/datavalues2/src/data_schema.rs b/common/datavalues2/src/data_schema.rs index 66aeaf7d961aa..8102201774b71 100644 --- a/common/datavalues2/src/data_schema.rs +++ b/common/datavalues2/src/data_schema.rs @@ -174,6 +174,7 @@ impl From<&ArrowSchema> for DataSchema { } } +#[allow(clippy::needless_borrow)] impl From for DataSchema { fn from(a_schema: ArrowSchema) -> Self { (&a_schema).into() diff --git a/common/exception/Cargo.toml b/common/exception/Cargo.toml index d990c5d2580d0..1d84f2f01578f 100644 --- a/common/exception/Cargo.toml +++ b/common/exception/Cargo.toml @@ -13,11 +13,11 @@ test = false [dependencies] # In alphabetical order common-arrow = { path = "../arrow" } -anyhow = "1.0.52" -backtrace = "0.3.63" -octocrab = "0.15.3" -serde = { version = "1.0.133", features = ["derive"] } -serde_json = "1.0.74" +anyhow = "1.0.53" +backtrace = "0.3.64" +octocrab = "0.15.4" +serde = { version = "1.0.136", features = ["derive"] } +serde_json = "1.0.78" thiserror = "1.0.30" tonic = "0.6.2" prost = "0.9.0" diff --git a/common/exception/src/exception_into.rs b/common/exception/src/exception_into.rs index 34266c11f9b8c..0f7fa3a0a978a 100644 --- a/common/exception/src/exception_into.rs +++ b/common/exception/src/exception_into.rs @@ -197,8 +197,8 @@ impl From for ErrorCode { } } -impl From<&tonic::Status> for ErrorCode { - fn from(status: &tonic::Status) -> Self { +impl From for ErrorCode { + fn from(status: tonic::Status) -> Self { match status.code() { tonic::Code::Unknown => { let details = status.details(); @@ -230,12 +230,6 @@ impl From<&tonic::Status> for ErrorCode { } } -impl From for ErrorCode { - fn from(status: tonic::Status) -> Self { - (&status).into() - } -} - impl From for tonic::Status { fn from(err: ErrorCode) -> Self { let rst_json = serde_json::to_vec::(&SerializedError { diff --git a/common/exception/tests/it/exception.rs b/common/exception/tests/it/exception.rs index b33c0f62f3668..e51dd9cb58cb3 100644 --- a/common/exception/tests/it/exception.rs +++ b/common/exception/tests/it/exception.rs @@ -115,15 +115,6 @@ fn test_from_and_to_status() -> anyhow::Result<()> { &status.details()[..29] ); - { - // test from &Status - - let e2: ErrorCode = (&status).into(); - - assert_eq!(1007, e2.code()); - assert_eq!("foo", e2.message()); - } - { // test from Status @@ -137,13 +128,6 @@ fn test_from_and_to_status() -> anyhow::Result<()> { let status1 = Status::unknown("foo"); assert_eq!(r#""#.as_bytes(), status1.details()); - { - // test from &Status - let e1: ErrorCode = (&status1).into(); - assert_eq!(1067, e1.code()); - assert_eq!("foo", e1.message()); - } - { // test from Status let e1: ErrorCode = status1.into(); diff --git a/common/functions/Cargo.toml b/common/functions/Cargo.toml index b646554f2264f..b55449a337528 100644 --- a/common/functions/Cargo.toml +++ b/common/functions/Cargo.toml @@ -22,18 +22,18 @@ sqlparser = { git = "https://github.com/datafuse-extras/sqlparser-rs", rev = "c3 # Crates.io dependencies dyn-clone = "1.0.4" -indexmap = "1.7.0" +indexmap = "1.8.0" once_cell = "1.9.0" -serde = { version = "1.0.133", features = ["derive"] } -serde_json = "1.0.74" +serde = { version = "1.0.136", features = ["derive"] } +serde_json = "1.0.78" bytes = "1.1.0" num = "0.4.0" ordered-float = "2.10.0" -crc32fast = "1.3.0" -sha1 = "0.6.0" -sha2 = "0.10.0" +crc32fast = "1.3.1" +sha1 = "0.10.0" +sha2 = "0.10.1" md5 = "0.7.0" -blake3 = "1.2.0" +blake3 = "1.3.1" twox-hash = "1.6.2" rand = "0.8.4" hex = "0.4.3" @@ -46,7 +46,7 @@ strength_reduce = "0.2.3" num-traits = "0.2.14" [dev-dependencies] -bumpalo = "3.9.0" +bumpalo = "3.9.1" common-datablocks = { path = "../datablocks" } -pretty_assertions = "1.0.0" +pretty_assertions = "1.1.0" float-cmp = "0.9.0" diff --git a/common/functions/src/scalars/hashes/sha1hash.rs b/common/functions/src/scalars/hashes/sha1hash.rs index f29aff1226739..408ab9c609334 100644 --- a/common/functions/src/scalars/hashes/sha1hash.rs +++ b/common/functions/src/scalars/hashes/sha1hash.rs @@ -13,6 +13,7 @@ // limitations under the License. use common_datavalues::prelude::*; +use sha1::Digest; use crate::scalars::strings::String2StringFunction; use crate::scalars::strings::StringOperator; @@ -25,7 +26,9 @@ impl StringOperator for Sha1 { fn apply_with_no_null<'a>(&'a mut self, s: &'a [u8], buffer: &mut [u8]) -> usize { let buffer = &mut buffer[0..40]; // TODO sha1 lib doesn't allow encode into buffer... - hex::encode_to_slice(sha1::Sha1::from(s).digest().bytes(), buffer).unwrap(); + let mut m = ::sha1::Sha1::new(); + m.update(s); + hex::encode_to_slice(m.finalize().as_slice(), buffer).unwrap(); 40 } diff --git a/common/grpc/Cargo.toml b/common/grpc/Cargo.toml index 8cd4efcdc8005..669eec333fd80 100644 --- a/common/grpc/Cargo.toml +++ b/common/grpc/Cargo.toml @@ -20,16 +20,16 @@ common-tracing = { path = "../tracing" } # Github dependencies # Crates.io dependencies -futures = "0.3.19" +futures = "0.3.21" jwt-simple = "0.10.8" prost = "0.9.0" -serde = { version = "1.0.133", features = ["derive"] } -serde_json = "1.0.74" +serde = { version = "1.0.136", features = ["derive"] } +serde_json = "1.0.78" tokio-stream = "0.1.8" tonic = { version = "0.6.2", features = ["transport", "codegen", "prost", "tls-roots", "tls"] } hyper = "0.14.16" once_cell = "1.9.0" -trust-dns-resolver = { version = "0.20.3", features = ["system-config"] } +trust-dns-resolver = { version = "0.20.4", features = ["system-config"] } async-trait = "0.1.52" [build-dependencies] diff --git a/common/infallible/Cargo.toml b/common/infallible/Cargo.toml index d8896b940fee0..fb68c8211a276 100644 --- a/common/infallible/Cargo.toml +++ b/common/infallible/Cargo.toml @@ -16,4 +16,4 @@ test = false # Github dependencies # Crates.io dependencies -parking_lot = "0.11.2" +parking_lot = "0.12.0" diff --git a/common/io/Cargo.toml b/common/io/Cargo.toml index 8fd102475cb92..191b68879b136 100644 --- a/common/io/Cargo.toml +++ b/common/io/Cargo.toml @@ -15,7 +15,7 @@ test = false [dependencies] common-exception= {path = "../exception"} bytes = "1.1.0" -serde = { version = "1.0.133", features = ["derive"] } +serde = { version = "1.0.136", features = ["derive"] } # Github dependencies bincode = { git = "https://github.com/datafuse-extras/bincode", rev = "fd3f9ff" } diff --git a/common/io/src/lib.rs b/common/io/src/lib.rs index 553bfb8901c7c..e1194824f3447 100644 --- a/common/io/src/lib.rs +++ b/common/io/src/lib.rs @@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +// https://github.com/rust-lang/rust-clippy/issues/8334 +#![allow(clippy::ptr_arg)] + pub mod prelude; mod binary_read; diff --git a/common/macros/Cargo.toml b/common/macros/Cargo.toml index 121b56fd6d598..641a20270a916 100644 --- a/common/macros/Cargo.toml +++ b/common/macros/Cargo.toml @@ -11,7 +11,7 @@ doctest = false test = false [dependencies] -quote = "1.0.14" +quote = "1.0.15" proc-macro2 = "1.0.36" -syn = { version = "1.0.84", features = ["full"] } +syn = { version = "1.0.86", features = ["full"] } synstructure = "0.12.6" diff --git a/common/management/Cargo.toml b/common/management/Cargo.toml index 8fb3d90cc125c..f61ef65a7a0d3 100644 --- a/common/management/Cargo.toml +++ b/common/management/Cargo.toml @@ -23,9 +23,9 @@ common-functions= {path = "../functions"} common-ast= {path = "../ast"} async-trait = "0.1.52" -serde = { version = "1.0.133", features = ["derive"] } -serde_json = "1.0.74" -tempfile = "3.2.0" +serde = { version = "1.0.136", features = ["derive"] } +serde_json = "1.0.78" +tempfile = "3.3.0" [dev-dependencies] @@ -33,4 +33,4 @@ common-base = { path = "../base" } common-meta-embedded = {path = "../meta/embedded" } mockall = "0.11.0" -tempfile = "3.2.0" +tempfile = "3.3.0" diff --git a/common/mem-allocator/Cargo.toml b/common/mem-allocator/Cargo.toml index 3b024f0e799c2..09f6bdef2bf9c 100644 --- a/common/mem-allocator/Cargo.toml +++ b/common/mem-allocator/Cargo.toml @@ -13,7 +13,7 @@ test = false common-base = {path = "../base" } tikv-jemalloc-sys = "0.4.2" common-infallible = { path = "../infallible" } -parking_lot = "0.11.2" +parking_lot = "0.12.0" [dev-dependencies] common-macros = { path = "../macros" } diff --git a/common/meta/api/Cargo.toml b/common/meta/api/Cargo.toml index 09a1b899c3acc..693484036e7d5 100644 --- a/common/meta/api/Cargo.toml +++ b/common/meta/api/Cargo.toml @@ -19,7 +19,7 @@ common-exception = {path = "../../exception" } common-meta-types = {path= "../types" } common-tracing = { path = "../../tracing" } -anyhow = "1.0.52" +anyhow = "1.0.53" async-trait = "0.1.52" -futures = "0.3.19" +futures = "0.3.21" maplit = "1.0.2" diff --git a/common/meta/embedded/Cargo.toml b/common/meta/embedded/Cargo.toml index ef5cb48bee5cc..c014c5c60ed3c 100644 --- a/common/meta/embedded/Cargo.toml +++ b/common/meta/embedded/Cargo.toml @@ -27,10 +27,10 @@ common-tracing = { path = "../../tracing" } # Crates.io dependencies async-trait = "0.1.52" derive_more = "0.99.17" -futures = "0.3.19" +futures = "0.3.21" once_cell = "1.9.0" -tempfile = "3.2.0" +tempfile = "3.3.0" [dev-dependencies] -anyhow = "1.0.52" +anyhow = "1.0.53" diff --git a/common/meta/grpc/Cargo.toml b/common/meta/grpc/Cargo.toml index ed0ed2f69d94e..05063d6be8a08 100644 --- a/common/meta/grpc/Cargo.toml +++ b/common/meta/grpc/Cargo.toml @@ -24,14 +24,14 @@ common-meta-types = { path = "../types" } common-tracing = { path = "../../tracing" } derive_more = "0.99.17" -futures = "0.3.19" +futures = "0.3.21" rand = "0.8.4" -serde = { version = "1.0.133", features = ["derive"] } -serde_json = "1.0.74" +serde = { version = "1.0.136", features = ["derive"] } +serde_json = "1.0.78" prost = "0.9.0" thiserror = "1.0.30" tonic = { version = "0.6.2", features = ["transport", "codegen", "prost", "tls-roots", "tls"] } [dev-dependencies] common-base = { path = "../../base" } -tempfile = "3.2.0" +tempfile = "3.3.0" diff --git a/common/meta/grpc/src/grpc_action.rs b/common/meta/grpc/src/grpc_action.rs index 284d8ef72caff..dc837cc5adecc 100644 --- a/common/meta/grpc/src/grpc_action.rs +++ b/common/meta/grpc/src/grpc_action.rs @@ -98,7 +98,7 @@ impl tonic::IntoRequest for MetaGrpcWriteReq { } /// Try convert DoActionAction to tonic::Request. -impl TryInto> for &MetaGrpcWriteReq { +impl TryInto> for MetaGrpcWriteReq { type Error = ErrorCode; fn try_into(self) -> common_exception::Result> { @@ -124,7 +124,7 @@ impl TryInto for Request { } } -impl TryInto> for &MetaGrpcReadReq { +impl TryInto> for MetaGrpcReadReq { type Error = ErrorCode; fn try_into(self) -> Result, Self::Error> { diff --git a/common/meta/grpc/src/grpc_client.rs b/common/meta/grpc/src/grpc_client.rs index f0ba59e87645b..d25b022b17f7d 100644 --- a/common/meta/grpc/src/grpc_client.rs +++ b/common/meta/grpc/src/grpc_client.rs @@ -65,7 +65,7 @@ impl ItemManager for MetaChannelManager { } async fn check(&self, mut ch: Self::Item) -> std::result::Result { - futures::future::poll_fn(|cx| (&mut ch).poll_ready(cx)) + futures::future::poll_fn(|cx| ch.poll_ready(cx)) .await .map_err(|e| { ErrorCode::CannotConnectNode(format!("Check rpc connect failed, error: {}", e)) @@ -178,7 +178,7 @@ impl MetaGrpcClient { R: DeserializeOwned, { let act: MetaGrpcWriteReq = v.into(); - let req: Request = (&act.clone()).try_into()?; + let req: Request = act.clone().try_into()?; let req = common_tracing::inject_span_to_tonic_request(req); let mut client = self.make_client().await?; @@ -192,7 +192,7 @@ impl MetaGrpcClient { *token = None; } let mut client = self.make_client().await?; - let req: Request = (&act).try_into()?; + let req: Request = act.try_into()?; let req = common_tracing::inject_span_to_tonic_request(req); Ok(client.write_msg(req).await?.into_inner()) } else { @@ -220,7 +220,7 @@ impl MetaGrpcClient { R: DeserializeOwned, { let act: MetaGrpcReadReq = v.into(); - let req: Request = (&act.clone()).try_into()?; + let req: Request = act.clone().try_into()?; let req = common_tracing::inject_span_to_tonic_request(req); let mut client = self.make_client().await?; @@ -234,7 +234,7 @@ impl MetaGrpcClient { *token = None; } let mut client = self.make_client().await?; - let req: Request = (&act).try_into()?; + let req: Request = act.try_into()?; let req = common_tracing::inject_span_to_tonic_request(req); Ok(client.read_msg(req).await?.into_inner()) } else { diff --git a/common/meta/raft-store/Cargo.toml b/common/meta/raft-store/Cargo.toml index 328a764f09579..e8e26981fa65a 100644 --- a/common/meta/raft-store/Cargo.toml +++ b/common/meta/raft-store/Cargo.toml @@ -22,22 +22,22 @@ common-tracing = { path = "../../tracing" } # crates.io deps -anyhow = "1.0.52" +anyhow = "1.0.53" async-trait = "0.1.52" bytes = "1.1.0" -clap = { version = "3.0.5", features = ["derive", "env"] } +clap = { version = "3.0.14", features = ["derive", "env"] } derive_more = "0.99.17" -futures = "0.3.19" +futures = "0.3.21" maplit = "1.0.2" once_cell = "1.9.0" prost = "0.9.0" rand = "0.8.4" -serde = { version = "1.0.133", features = ["derive"] } -serde_json = "1.0.74" +serde = { version = "1.0.136", features = ["derive"] } +serde_json = "1.0.78" thiserror = "1.0.30" tonic = { version = "0.6.2", features = ["transport", "codegen", "prost", "tls-roots", "tls"] } [dev-dependencies] common-base = { path = "../../base" } -pretty_assertions = "1.0.0" -tempfile = "3.2.0" +pretty_assertions = "1.1.0" +tempfile = "3.3.0" diff --git a/common/meta/sled-store/Cargo.toml b/common/meta/sled-store/Cargo.toml index a384421aaa8ad..5e340bac9d0eb 100644 --- a/common/meta/sled-store/Cargo.toml +++ b/common/meta/sled-store/Cargo.toml @@ -15,14 +15,14 @@ test = false common-exception = { path = "../../exception" } common-tracing = { path = "../../tracing" } -anyhow = "1.0.52" +anyhow = "1.0.53" byteorder = "1.4.3" once_cell = "1.9.0" -serde = { version = "1.0.133", features = ["derive"] } +serde = { version = "1.0.136", features = ["derive"] } openraft = { git = "https://github.com/datafuselabs/openraft", rev = "f633756d60152d171909aea56f80d18905cd4002"} -serde_json = "1.0.74" +serde_json = "1.0.78" sled = { git = "https://github.com/datafuse-extras/sled", tag = "v0.34.7-datafuse.1", default-features = false } -tempfile = "3.2.0" +tempfile = "3.3.0" [dev-dependencies] diff --git a/common/meta/sled-store/src/sled_tree.rs b/common/meta/sled-store/src/sled_tree.rs index 0eb8d40600e99..c0e9b6e9fb688 100644 --- a/common/meta/sled-store/src/sled_tree.rs +++ b/common/meta/sled-store/src/sled_tree.rs @@ -112,7 +112,7 @@ impl SledTree { ) -> common_exception::Result { let sync = sync && self.sync; - let result: TransactionResult = (&self.tree).transaction(move |tree| { + let result: TransactionResult = self.tree.transaction(move |tree| { let txn_sled_tree = TransactionSledTree { txn_tree: tree }; let r = f(txn_sled_tree.clone()); match r { diff --git a/common/meta/types/Cargo.toml b/common/meta/types/Cargo.toml index a989508210a34..4efab2d31350f 100644 --- a/common/meta/types/Cargo.toml +++ b/common/meta/types/Cargo.toml @@ -21,12 +21,12 @@ maplit = "1.0.2" openraft = { git = "https://github.com/datafuselabs/openraft", rev = "f633756d60152d171909aea56f80d18905cd4002"} once_cell = "1.9.0" prost = "0.9.0" -serde = { version = "1.0.133", features = ["derive"] } -serde_json = "1.0.74" +serde = { version = "1.0.136", features = ["derive"] } +serde_json = "1.0.78" thiserror = "1.0.30" tonic = { version = "0.6.2", features = ["transport", "codegen", "prost", "tls-roots", "tls"] } -sha1 = "0.6.0" -sha2 = "0.10.0" +sha1 = "0.10.0" +sha2 = "0.10.1" hex = "0.4.3" [build-dependencies] @@ -34,4 +34,4 @@ common-building = { path = "../../building" } tonic-build = "0.6.2" [dev-dependencies] -anyhow = "1.0.52" +anyhow = "1.0.53" diff --git a/common/meta/types/src/match_seq.rs b/common/meta/types/src/match_seq.rs index 9db730387717f..bab449bc11ced 100644 --- a/common/meta/types/src/match_seq.rs +++ b/common/meta/types/src/match_seq.rs @@ -41,15 +41,9 @@ pub enum MatchSeq { impl From> for MatchSeq { fn from(s: Option) -> Self { - (&s).into() - } -} - -impl From<&Option> for MatchSeq { - fn from(s: &Option) -> Self { match s { None => MatchSeq::Any, - Some(s) => MatchSeq::Exact(*s), + Some(s) => MatchSeq::Exact(s), } } } diff --git a/common/meta/types/src/user_auth.rs b/common/meta/types/src/user_auth.rs index 843a4c8d6931a..0268bc7a8696f 100644 --- a/common/meta/types/src/user_auth.rs +++ b/common/meta/types/src/user_auth.rs @@ -96,7 +96,7 @@ pub enum AuthInfo { fn calc_sha1(v: &[u8]) -> [u8; 20] { let mut m = ::sha1::Sha1::new(); m.update(v); - m.digest().bytes() + m.finalize().into() } fn double_sha1(v: &[u8]) -> [u8; 20] { @@ -205,7 +205,7 @@ impl AuthInfo { m.update(salt); m.update(user_password_hash); - let result = m.digest().bytes(); + let result: [u8; 20] = m.finalize().into(); if input.len() != result.len() { return Err(ErrorCode::SHA1CheckFailed("SHA1 check failed")); } diff --git a/common/metrics/Cargo.toml b/common/metrics/Cargo.toml index 03808cb6e4f97..80fafdcf62025 100644 --- a/common/metrics/Cargo.toml +++ b/common/metrics/Cargo.toml @@ -18,7 +18,13 @@ common-tracing = { path = "../tracing" } # Crates.io dependencies once_cell = "1.9.0" -metrics = "0.17.1" -metrics-exporter-prometheus = "0.7.0" +metrics = "0.18.0" +metrics-exporter-prometheus = "0.8.0" prometheus-parse = "0.2.2" -serde = { version = "1.0.133", features = ["derive"] } +serde = { version = "1.0.136", features = ["derive"] } + +[dev-dependencies.tokio] +version = "1.16.1" +default-features = false +features = ["io-util", "net", "sync", "rt-multi-thread", "macros"] + diff --git a/common/metrics/src/recorder.rs b/common/metrics/src/recorder.rs index bfcc4e9f06655..cd86542fac3e9 100644 --- a/common/metrics/src/recorder.rs +++ b/common/metrics/src/recorder.rs @@ -49,11 +49,13 @@ pub fn init_default_metrics_recorder() { /// Init prometheus recorder. fn init_prometheus_recorder() { - let recorder = PrometheusBuilder::new().build(); + let recorder = PrometheusBuilder::new() + .build() + .expect("failed to build Prometheus recorder"); let mut h = PROMETHEUS_HANDLE.as_ref().write(); - *h = Some(recorder.handle()); + *h = Some(recorder.0.handle()); metrics::clear_recorder(); - match metrics::set_boxed_recorder(Box::new(recorder)) { + match metrics::set_boxed_recorder(Box::new(recorder.0)) { Ok(_) => (), Err(err) => tracing::warn!("Install prometheus recorder failed, cause: {}", err), }; diff --git a/common/metrics/tests/it/main.rs b/common/metrics/tests/it/main.rs index a25b2f0bdf1db..7f4f5b6ed9027 100644 --- a/common/metrics/tests/it/main.rs +++ b/common/metrics/tests/it/main.rs @@ -20,8 +20,8 @@ use common_metrics::init_default_metrics_recorder; use common_metrics::try_handle; use common_metrics::MetricValue; -#[test] -fn test_dump_metric_samples() -> common_exception::Result<()> { +#[tokio::test] +async fn test_dump_metric_samples() -> common_exception::Result<()> { init_default_metrics_recorder(); metrics::counter!("test.test1_count", 1); metrics::counter!("test.test2_count", 2); diff --git a/common/planners/Cargo.toml b/common/planners/Cargo.toml index 4b7685a584b02..081e96d5939ab 100644 --- a/common/planners/Cargo.toml +++ b/common/planners/Cargo.toml @@ -23,9 +23,9 @@ common-meta-types = {path= "../meta/types" } # Crates.io dependencies bitflags = "1.3.2" -serde = { version = "1.0.133", features = ["derive"] } -futures = "0.3.19" +serde = { version = "1.0.136", features = ["derive"] } +futures = "0.3.21" once_cell = "1.9.0" [dev-dependencies] -pretty_assertions = "1.0.0" +pretty_assertions = "1.1.0" diff --git a/common/planners/src/plan_expression_chain.rs b/common/planners/src/plan_expression_chain.rs index b46c2d0e963ca..264ce3385e6a7 100644 --- a/common/planners/src/plan_expression_chain.rs +++ b/common/planners/src/plan_expression_chain.rs @@ -58,7 +58,7 @@ impl ExpressionChain { fn post_visit(self, expr: &Expression) -> Result { unsafe { - (&mut *self.0).add_expr(expr)?; + (*self.0).add_expr(expr)?; Ok(self) } } diff --git a/common/streams/Cargo.toml b/common/streams/Cargo.toml index 12ded88826649..e9de677ed6d78 100644 --- a/common/streams/Cargo.toml +++ b/common/streams/Cargo.toml @@ -28,10 +28,10 @@ common-tracing = {path = "../tracing"} async-stream = "0.3.2" async-trait = "0.1.52" csv-async = "1.2.4" -futures = "0.3.19" +futures = "0.3.21" pin-project-lite = "0.2.8" -tempfile = "3.2.0" +tempfile = "3.3.0" tokio-stream = { version = "0.1.8", features = ["net"] } [dev-dependencies] -common-dal2 = { path = "../dal2" } \ No newline at end of file +common-dal2 = { path = "../dal2" } diff --git a/common/tracing/Cargo.toml b/common/tracing/Cargo.toml index 564c30ae99cf9..ad0213f3fc22d 100644 --- a/common/tracing/Cargo.toml +++ b/common/tracing/Cargo.toml @@ -14,14 +14,14 @@ test = false console = ["console-subscriber"] [dependencies] # In alphabetical order -console-subscriber = { version = "0.1.0", optional = true } +console-subscriber = { version = "0.1.1", optional = true } once_cell = "1.9.0" -opentelemetry = { version = "0.16.0", default-features = false, features = ["trace", "rt-tokio"] } -opentelemetry-jaeger = { version = "0.15.0", features = ["rt-tokio"] } +opentelemetry = { version = "0.17.0", default-features = false, features = ["trace", "rt-tokio"] } +opentelemetry-jaeger = { version = "0.16.0", features = ["rt-tokio"] } tonic = "0.6.2" -tracing = "0.1.29" +tracing = "0.1.30" tracing-appender = "0.2.0" -tracing-bunyan-formatter = "0.3.1" +tracing-bunyan-formatter = "0.3.2" tracing-futures = { version = "0.2.5", features = ["futures-03"] } -tracing-opentelemetry = "0.16.0" -tracing-subscriber = { version = "0.3.5", features = ["env-filter"] } +tracing-opentelemetry = "0.17.0" +tracing-subscriber = { version = "0.3.8", features = ["env-filter"] } diff --git a/metasrv/Cargo.toml b/metasrv/Cargo.toml index e4790575dc7f7..ee04a608010e2 100644 --- a/metasrv/Cargo.toml +++ b/metasrv/Cargo.toml @@ -14,6 +14,8 @@ test = false [[bin]] name = "databend-meta" path = "src/bin/metasrv.rs" +doctest = false +test = false [features] default = ["simd"] @@ -41,33 +43,33 @@ common-metrics = { path = "../common/metrics" } # Github dependencies # Crates.io dependencies -anyerror = "0.1.1" -anyhow = "1.0.52" +anyerror = "0.1.2" +anyhow = "1.0.53" async-trait = "0.1.52" -backtrace = "0.3.63" +backtrace = "0.3.64" byteorder = "1.4.3" -clap = { version = "3.0.5", features = ["derive", "env"] } +clap = { version = "3.0.14", features = ["derive", "env"] } derive_more = "0.99.17" -futures = "0.3.19" -indexmap = "1.7.0" -metrics = "0.17.1" -metrics-exporter-prometheus = "0.7.0" +futures = "0.3.21" +indexmap = "1.8.0" +metrics = "0.18.0" +metrics-exporter-prometheus = "0.8.0" num = "0.4.0" num_cpus = "1.13.1" prost = "0.9.0" rand = "0.8.4" -serde = { version = "1.0.133", features = ["derive"] } -serde_json = "1.0.74" +serde = { version = "1.0.136", features = ["derive"] } +serde_json = "1.0.78" sled = { git = "https://github.com/datafuse-extras/sled", tag = "v0.34.7-datafuse.1", default-features = false } -tempfile = "3.2.0" +tempfile = "3.3.0" thiserror = "1.0.30" threadpool = "1.8.1" tokio-stream = "0.1.8" tokio-util = "0.6.9" tonic = { version = "0.6.2", features = ["tls"] } -sha2 = "0.10.0" +sha2 = "0.10.1" uuid = { version = "0.8.2", features = ["serde", "v4"] } -poem = { version = "1.2.27", features = ["rustls"] } +poem = { version = "1.2.53", features = ["rustls"] } toml = "0.5.8" [build-dependencies] @@ -79,5 +81,5 @@ common-meta-api = { path = "../common/meta/api" } maplit = "1.0.2" regex = "1.5.4" -pretty_assertions = "1.0.0" -reqwest = { version = "0.11.8", features = ["json"] } +pretty_assertions = "1.1.0" +reqwest = { version = "0.11.9", features = ["json"] } diff --git a/metasrv/src/network.rs b/metasrv/src/network.rs index dcb3eed1a89dd..b8bebedccbdfb 100644 --- a/metasrv/src/network.rs +++ b/metasrv/src/network.rs @@ -51,7 +51,7 @@ impl ItemManager for ChannelManager { } async fn check(&self, mut ch: Channel) -> Result { - futures::future::poll_fn(|cx| (&mut ch).poll_ready(cx)).await?; + futures::future::poll_fn(|cx| ch.poll_ready(cx)).await?; Ok(ch) } } diff --git a/metasrv/tests/it/api/http/cluster_state_test.rs b/metasrv/tests/it/api/http/cluster_state_test.rs index 5067f563a18d5..0d57c5a59ff02 100644 --- a/metasrv/tests/it/api/http/cluster_state_test.rs +++ b/metasrv/tests/it/api/http/cluster_state_test.rs @@ -108,8 +108,7 @@ async fn test_cluster_state() -> common_exception::Result<()> { assert_eq!(response.status(), StatusCode::OK); let body = response.into_body().into_vec().await.unwrap(); - let state = - serde_json::from_str::((&String::from_utf8_lossy(&body)).as_ref())?; + let state = serde_json::from_str::(String::from_utf8_lossy(&body).as_ref())?; let voters = state["voters"].as_array().unwrap(); let non_voters = state["non_voters"].as_array().unwrap(); assert_eq!(voters.len(), 2); diff --git a/query/Cargo.toml b/query/Cargo.toml index b38a5e6f58b65..7f9834a6b919a 100644 --- a/query/Cargo.toml +++ b/query/Cargo.toml @@ -14,6 +14,8 @@ test = false [[bin]] name = "databend-query" path = "src/bin/databend-query.rs" +doctest = false +test = false [features] default = ["simd"] @@ -60,35 +62,35 @@ async-compat = "0.2.1" async-trait = "0.1.52" async-recursion = "1.0.0" async-stream = "0.3.2" -poem = { version = "1.2.27", features = ["rustls", "multipart"] } -bumpalo = "3.9.0" -backoff = { version="0.4.0"} +poem = { version = "1.2.53", features = ["rustls", "multipart"] } +bumpalo = "3.9.1" +backoff = "0.4.0" byteorder = "1.4.3" bytes = "1.1.0" cargo-license = "0.4.2" cargo_metadata = "0.14.1" chrono = "0.4.19" chrono-tz = "0.6.1" -clap = { version = "3.0.5", features = ["derive", "env"] } +clap = { version = "3.0.14", features = ["derive", "env"] } dyn-clone = "1.0.4" -futures = "0.3.19" -headers = "0.3.5" +futures = "0.3.21" +headers = "0.3.6" hyper = "0.14.16" -indexmap = "1.7.0" +indexmap = "1.8.0" once_cell = "1.9.0" -metrics = "0.17.1" +metrics = "0.18.0" nom = "7.1.0" num = "0.4.0" num_cpus = "1.13.1" -octocrab = "0.15.3" +octocrab = "0.15.4" paste = "1.0.6" prost = "0.9.0" rand = "0.8.4" -reqwest = "0.11.8" -serde = { version = "1.0.133", features = ["derive"] } -serde_json = "1.0.74" -sha1 = "0.6.0" -sha2 = "0.10.0" +reqwest = "0.11.9" +serde = { version = "1.0.136", features = ["derive"] } +serde_json = "1.0.78" +sha1 = "0.10.0" +sha2 = "0.10.1" threadpool = "1.8.1" tokio-rustls = "0.23.2" tokio-stream = { version = "0.1.8", features = ["net"] } @@ -101,8 +103,8 @@ petgraph = "0.6.0" regex = "1.5.4" bincode = "1.3.3" bit-vec = { version = "0.6.3", features = ["serde_std"] } -jwt-simple = "0.10" -rsa = "0.5" +jwt-simple = "0.10.8" +rsa = "0.5.0" base64 = "0.13.0" [dev-dependencies] @@ -110,10 +112,10 @@ clickhouse-driver = { git = "https://github.com/datafuse-extras/clickhouse_drive criterion = "0.3.5" maplit = "1.0.2" mysql_async = "0.29.0" -pretty_assertions = "1.0.0" -reqwest = { version = "0.11.8", features = ["json", "native-tls"] } -tempfile = "3.2.0" -httpmock = "0.6.5" +pretty_assertions = "1.1.0" +reqwest = { version = "0.11.9", features = ["json", "native-tls"] } +tempfile = "3.3.0" +httpmock = "0.6.6" [build-dependencies] common-building = { path = "../common/building" } @@ -121,3 +123,4 @@ common-building = { path = "../common/building" } [[bench]] name = "bench_main" harness = false + diff --git a/query/src/pipelines/new/processors/processor.rs b/query/src/pipelines/new/processors/processor.rs index aeb718b65e440..e7d6691ad5ba0 100644 --- a/query/src/pipelines/new/processors/processor.rs +++ b/query/src/pipelines/new/processors/processor.rs @@ -78,22 +78,22 @@ impl ProcessorPtr { /// # Safety pub unsafe fn name(&self) -> &'static str { - (&*self.inner.get()).name() + (*self.inner.get()).name() } /// # Safety pub unsafe fn event(&self) -> Result { - (&mut *self.inner.get()).event() + (*self.inner.get()).event() } /// # Safety pub unsafe fn process(&self) -> Result<()> { - (&mut *self.inner.get()).process() + (*self.inner.get()).process() } /// # Safety pub unsafe fn async_process(&self) -> BoxFuture<'static, Result<()>> { - (&mut *self.inner.get()).async_process().boxed() + (*self.inner.get()).async_process().boxed() } } diff --git a/query/src/sql/planner/expression_binder.rs b/query/src/sql/planner/expression_binder.rs index 1f6f747f392d6..def0762aea9a3 100644 --- a/query/src/sql/planner/expression_binder.rs +++ b/query/src/sql/planner/expression_binder.rs @@ -34,7 +34,7 @@ impl ExpressionBinder { table, column, } => { - let table_name = table.as_ref().map(|t| (&t.name).to_lowercase()); + let table_name = table.as_ref().map(|t| (t.name).to_lowercase()); let column_name = column.name.to_lowercase(); let column = bind_context.resolve_column(table_name, column_name)?; Ok(ScalarExpr::BoundVariable(BoundVariable { diff --git a/query/src/storages/github/github_table.rs b/query/src/storages/github/github_table.rs index 7b8b5d0931480..9af1c5c125e86 100644 --- a/query/src/storages/github/github_table.rs +++ b/query/src/storages/github/github_table.rs @@ -88,7 +88,7 @@ impl GithubTable { GithubTableType::Issues => RepoIssuesTable::create(self.options.clone()), GithubTableType::PullRequests => RepoPRsTable::create(self.options.clone()), }; - Ok(table.get_data_from_github().await?) + table.get_data_from_github().await } pub fn description() -> StorageDescription { diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 7ef09dfa57842..0e2a0b7650afe 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2022-01-17" +channel = "nightly-2022-02-07" components = ["rustfmt", "clippy"] diff --git a/tools/benchmark/Cargo.toml b/tools/benchmark/Cargo.toml index abce1a4f7ca46..6a340662e07da 100644 --- a/tools/benchmark/Cargo.toml +++ b/tools/benchmark/Cargo.toml @@ -7,6 +7,10 @@ publish = false edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[[bin]] +name = "databend-benchmark" +doctest = false +test = false [dependencies] # Workspace dependencies @@ -20,10 +24,10 @@ common-tracing = { path = "../../common/tracing" } clickhouse-driver = { git = "https://github.com/datafuse-extras/clickhouse_driver", rev = "9d2133f" } # Crates.io dependencies -clap = { version = "3.0.5", features = ["derive", "env"] } -crossbeam-queue = "0.3.2" +clap = { version = "3.0.14", features = ["derive", "env"] } +crossbeam-queue = "0.3.4" ctrlc = { version = "3.2.1", features = ["termination"] } -futures = "0.3.19" +futures = "0.3.21" quantiles = "0.7.1" rand = "0.8.4" -serde = { version = "1.0.133", features = ["derive"] } +serde = { version = "1.0.136", features = ["derive"] } diff --git a/tools/fuzz/Cargo.toml b/tools/fuzz/Cargo.toml index bf93b0fe35a50..d0e7b6d94cef7 100644 --- a/tools/fuzz/Cargo.toml +++ b/tools/fuzz/Cargo.toml @@ -7,6 +7,8 @@ publish = false [[bin]] name = "fuzz_parse_sql" path = "fuzz_targets/fuzz_parse_sql.rs" +doctest = false +test = false [dependencies] honggfuzz = "0.5.54"