From 870ba34fc37bf29a63cfa9ee68cfd8c681aea48d Mon Sep 17 00:00:00 2001 From: TennyZhuang Date: Tue, 21 Mar 2023 17:20:06 +0800 Subject: [PATCH] chore(deps): bump minitrace,toml,auto_enums,bit_flags,... (#8682) Signed-off-by: TennyZhuang --- Cargo.lock | 280 ++++++++---------- src/bench/Cargo.toml | 2 +- src/common/Cargo.toml | 6 +- src/common/src/constants.rs | 2 + .../column_aware_row_encoding.rs | 7 +- src/storage/Cargo.toml | 2 +- .../src/table/batch_table/storage_table.rs | 2 +- src/tests/state_cleaning_test/Cargo.toml | 2 +- src/workspace-hack/Cargo.toml | 4 +- 9 files changed, 141 insertions(+), 166 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 18c884658b91..6419a4515761 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -85,9 +85,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anyhow" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" dependencies = [ "backtrace", ] @@ -444,32 +444,10 @@ dependencies = [ [[package]] name = "auto_enums" -version = "0.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0dfe45d75158751e195799f47ea02e81f570aa24bc5ef999cdd9e888c4b5c3" -dependencies = [ - "auto_enums_core", - "auto_enums_derive", -] - -[[package]] -name = "auto_enums_core" -version = "0.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da47c46001293a2c4b744d731958be22cff408a2ab76e2279328f9713b1267b4" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "auto_enums_derive" -version = "0.7.12" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41aed1da83ecdc799503b7cb94da1b45a34d72b49caf40a61d9cf5b88ec07cfd" +checksum = "10143e1d6fc660ac7bfc268c6ec2f9699129a3cfbb241eed50393d1562e0a4ce" dependencies = [ - "autocfg", "derive_utils", "proc-macro2", "quote", @@ -890,7 +868,7 @@ checksum = "13d8068b6ccb8b34db9de397c7043f91db8b4c66414952c6db944f238c4d3db3" dependencies = [ "async-trait", "axum-core", - "bitflags", + "bitflags 1.3.2", "bytes", "futures-util", "http", @@ -996,7 +974,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce860f38082f1544a557dfa447838143e1b0bfa061c0369e407ebadf640001d1" dependencies = [ "bcc-sys", - "bitflags", + "bitflags 1.3.2", "byteorder", "libc", "socket2", @@ -1030,6 +1008,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1" + [[package]] name = "bk-tree" version = "0.4.0" @@ -1110,9 +1094,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1" +checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" dependencies = [ "memchr", "serde", @@ -1350,7 +1334,7 @@ version = "3.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" dependencies = [ - "bitflags", + "bitflags 1.3.2", "clap_lex 0.2.4", "indexmap", "textwrap", @@ -1358,13 +1342,13 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.8" +version = "4.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5" +checksum = "42dfd32784433290c51d92c438bb72ea5063797fc3cc9a21a8c4346bebbb2098" dependencies = [ - "bitflags", + "bitflags 2.0.2", "clap_derive", - "clap_lex 0.3.2", + "clap_lex 0.3.3", "is-terminal", "once_cell", "strsim", @@ -1373,9 +1357,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.1.8" +version = "4.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bec8e5c9d09e439c4335b1af0abaab56dcf3b94999a936e1bb47b9134288f0" +checksum = "fddf67631444a3a3e3e5ac51c36a5e01335302de677bd78759eaa90ab1f46644" dependencies = [ "heck 0.4.1", "proc-macro-error", @@ -1395,9 +1379,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09" +checksum = "033f6b7a4acb1f358c742aaca805c939ee73b4c6209ae4318ec7aca81c42e646" dependencies = [ "os_str_bytes", ] @@ -1747,7 +1731,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crossterm_winapi", "libc", "mio", @@ -1830,9 +1814,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.60+curl-7.88.1" +version = "0.4.61+curl-8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "717abe2cb465a5da6ce06617388a3980c9a2844196734bec8ccb8e575250f13f" +checksum = "14d05c10f541ae6f3bc5b3d923c20001f47db7d5f0b2bc6ad16490133842db79" dependencies = [ "cc", "libc", @@ -2074,9 +2058,9 @@ dependencies = [ [[package]] name = "derive_utils" -version = "0.11.2" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532b4c15dccee12c7044f1fcad956e98410860b22231e44a3b827464797ca7bf" +checksum = "7590f99468735a318c254ca9158d0c065aa9b5312896b5a043b5e39bc96f5fa2" dependencies = [ "proc-macro2", "quote", @@ -2346,7 +2330,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "084632422a59165633e28f8436545a6694b3d659405ceb3be0a441d4bfbf25d1" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -2379,7 +2363,7 @@ version = "23.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77f5399c2c9c50ae9418e522842ad362f61ee48b346ac106807bd355a8a7c619" dependencies = [ - "bitflags", + "bitflags 1.3.2", "rustc_version", ] @@ -3188,10 +3172,11 @@ checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" [[package]] name = "io-lifetimes" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" +checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" dependencies = [ + "hermit-abi 0.3.1", "libc", "windows-sys 0.45.0", ] @@ -3204,9 +3189,9 @@ checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "is-terminal" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" +checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", @@ -3302,11 +3287,11 @@ dependencies = [ [[package]] name = "jsonwebtoken" -version = "8.2.0" +version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f4f04699947111ec1733e71778d763555737579e44b85844cae8e1940a1828" +checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.13.1", + "base64 0.21.0", "pem", "ring", "serde", @@ -3458,7 +3443,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7b603516767d1ab23d0de09d023e62966c3322f7148297c35cf3d97aa8b37fa" dependencies = [ - "clap 4.1.8", + "clap 4.1.11", "termcolor", "threadpool", ] @@ -3815,9 +3800,9 @@ dependencies = [ [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" @@ -3837,25 +3822,23 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "minitrace" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a07fdf302cc0591c97eb45939550ddaddd9962e400c20b319aa16c244cb1f16" +checksum = "317e28b8c337ada2fd437611c241ce053d5b7f5480b79e945597996b87b1de96" dependencies = [ - "crossbeam", "futures", "minitrace-macro", "minstant", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "pin-project", - "retain_mut", ] [[package]] name = "minitrace-jaeger" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e130c7db911742ff545bb42d4d32c360cb272204ce021c50fd1c9f89fa65cf5b" +checksum = "7a5abe3273cd524b57b11925721595df5f8e957344c70e285a3a31c7e21523ac" dependencies = [ "async-std", "minitrace", @@ -3864,9 +3847,9 @@ dependencies = [ [[package]] name = "minitrace-macro" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4132dfe6097f4a90c0bbb34be0687c38d14303dd2e74f8442ae80e9bc5a34c47" +checksum = "77814d165883613a1846517efdc50b88fabd9c210b7ff4d3745b38b99d539652" dependencies = [ "proc-macro-error", "proc-macro2", @@ -3989,7 +3972,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.6.5", @@ -4002,7 +3985,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "static_assertions", @@ -4241,9 +4224,9 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "opendal" -version = "0.30.2" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3f51ae9f36eabb51da3a10c491feb406ecf2c65faf1edb0b580f9a1acb0f1e8" +checksum = "ecd1bedb1311f05ef3a0cf6dbeb58ee0e01e75735d74003343c802d623b4c6d2" dependencies = [ "anyhow", "async-compat", @@ -4301,11 +4284,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.45" +version = "0.10.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" +checksum = "d8b277f87dacc05a6b709965d1cbafac4649d6ce9f3ce9ceb88508b5666dfec9" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", @@ -4333,18 +4316,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.25.1+1.1.1t" +version = "111.25.2+1.1.1t" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef9a9cc6ea7d9d5e7c4a913dc4b48d0e359eddf01af1dfec96ba7064b4aba10" +checksum = "320708a054ad9b3bf314688b5db87cf4d6683d64cfc835e2337924ae62bf4431" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.80" +version = "0.9.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" +checksum = "a95792af3c4e0153c3914df2261bedd30a98476f94dc892b67dfe1d89d433a04" dependencies = [ "autocfg", "cc", @@ -4455,9 +4438,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.4.1" +version = "6.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" +checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" [[package]] name = "ouroboros" @@ -4846,7 +4829,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if", "concurrent-queue", "libc", @@ -4983,9 +4966,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.1.24" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebcd279d20a4a0a2404a33056388e950504d891c855c7975b9a8fef75f3bf04" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ "proc-macro2", "syn", @@ -5055,7 +5038,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0941606b9934e2d98a3677759a971756eb821f75764d0e0d26946d08e74d9104" dependencies = [ - "bitflags", + "bitflags 1.3.2", "byteorder", "hex", "lazy_static", @@ -5068,7 +5051,7 @@ version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1de8dacb0873f77e6aefc6d71e044761fcc68060290f5b1089fcdf84626bb69" dependencies = [ - "bitflags", + "bitflags 1.3.2", "byteorder", "hex", "lazy_static", @@ -5258,7 +5241,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" dependencies = [ - "bitflags", + "bitflags 1.3.2", "getopts", "memchr", "unicase", @@ -5334,6 +5317,16 @@ dependencies = [ "serde", ] +[[package]] +name = "quick-xml" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5c1a97b1bc42b1d550bfb48d4262153fe400a12bab1511821736f7eac76d7e2" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "quote" version = "1.0.23" @@ -5438,7 +5431,7 @@ version = "10.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -5497,7 +5490,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -5554,9 +5547,9 @@ dependencies = [ [[package]] name = "reqsign" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4d5fefeaaa1e64f4aabb79da4ea68bf6d0e7935ad927728280d2a8e95735fc" +checksum = "a7db6d8d2cd7fa61403d14de670f98d7cedac38143681c124943d7bb69258b3a" dependencies = [ "anyhow", "backon", @@ -5571,7 +5564,7 @@ dependencies = [ "log", "once_cell", "percent-encoding", - "quick-xml 0.27.1", + "quick-xml 0.28.1", "rand 0.8.5", "rsa", "rust-ini", @@ -5585,9 +5578,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" +checksum = "0ba30cc2c0cd02af1222ed216ba659cdb2f879dfe3181852fe7c50b1d0005949" dependencies = [ "base64 0.21.0", "bytes", @@ -5665,7 +5658,7 @@ version = "0.2.0-alpha" dependencies = [ "anyhow", "chrono", - "clap 4.1.8", + "clap 4.1.11", "console", "dialoguer", "enum-iterator", @@ -5711,7 +5704,7 @@ dependencies = [ name = "risingwave_backup_cmd" version = "0.2.0-alpha" dependencies = [ - "clap 4.1.8", + "clap 4.1.11", "madsim-tokio", "risingwave_backup", "risingwave_meta", @@ -5771,7 +5764,7 @@ dependencies = [ "bcc", "bytes", "bytesize", - "clap 4.1.8", + "clap 4.1.11", "futures", "hdrhistogram", "isahc", @@ -5788,7 +5781,7 @@ dependencies = [ "risingwave_storage", "serde", "tokio-stream", - "toml 0.5.11", + "toml 0.7.3", "tracing", "tracing-opentelemetry", "tracing-subscriber", @@ -5800,7 +5793,7 @@ name = "risingwave_cmd" version = "0.2.0-alpha" dependencies = [ "anyhow", - "clap 4.1.8", + "clap 4.1.11", "madsim-tokio", "risingwave_common", "risingwave_compactor", @@ -5820,7 +5813,7 @@ name = "risingwave_cmd_all" version = "0.2.0-alpha" dependencies = [ "anyhow", - "clap 4.1.8", + "clap 4.1.11", "console", "madsim-tokio", "risingwave_common", @@ -5848,12 +5841,12 @@ dependencies = [ "arrow-schema", "async-trait", "auto_enums", - "bitflags", + "bitflags 2.0.2", "byteorder", "bytes", "chrono", "chrono-tz", - "clap 4.1.8", + "clap 4.1.11", "comfy-table", "crc32fast", "criterion", @@ -5897,7 +5890,7 @@ dependencies = [ "sysinfo", "tempfile", "thiserror", - "toml 0.5.11", + "toml 0.7.3", "tracing", "twox-hash", "url", @@ -5942,7 +5935,7 @@ dependencies = [ "anyhow", "async-trait", "bytes", - "clap 4.1.8", + "clap 4.1.11", "futures", "itertools", "madsim-tokio", @@ -5968,7 +5961,7 @@ version = "0.2.0-alpha" dependencies = [ "anyhow", "async-trait", - "clap 4.1.8", + "clap 4.1.11", "madsim-tokio", "madsim-tonic", "prometheus", @@ -5993,7 +5986,7 @@ dependencies = [ "anyhow", "async-trait", "await-tree", - "clap 4.1.8", + "clap 4.1.11", "either", "futures", "futures-async-stream", @@ -6102,7 +6095,7 @@ dependencies = [ "anyhow", "bytes", "chrono", - "clap 4.1.8", + "clap 4.1.11", "comfy-table", "futures", "itertools", @@ -6168,7 +6161,7 @@ dependencies = [ "async-trait", "bk-tree", "bytes", - "clap 4.1.8", + "clap 4.1.11", "derivative", "downcast-rs", "dyn-clone", @@ -6297,7 +6290,7 @@ dependencies = [ "aws-sdk-ec2", "axum", "bytes", - "clap 4.1.8", + "clap 4.1.11", "crepe", "easy-ext", "either", @@ -6417,7 +6410,7 @@ name = "risingwave_regress_test" version = "0.2.0-alpha" dependencies = [ "anyhow", - "clap 4.1.8", + "clap 4.1.11", "madsim-tokio", "path-absolutize", "similar", @@ -6473,7 +6466,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "clap 4.1.8", + "clap 4.1.11", "console", "futures", "glob", @@ -6561,7 +6554,7 @@ version = "0.2.0-alpha" dependencies = [ "anyhow", "chrono", - "clap 4.1.8", + "clap 4.1.11", "itertools", "libtest-mimic", "madsim-tokio", @@ -6584,7 +6577,7 @@ version = "0.2.0-alpha" dependencies = [ "anyhow", "chrono", - "clap 4.1.8", + "clap 4.1.11", "futures", "itertools", "madsim-tokio", @@ -6594,7 +6587,7 @@ dependencies = [ "serde_with 2.3.1", "tokio-postgres", "tokio-stream", - "toml 0.4.10", + "toml 0.7.3", "tracing", "workspace-hack", ] @@ -6849,11 +6842,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.9" +version = "0.36.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" +checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -6986,7 +6979,7 @@ version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -7014,9 +7007,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.155" +version = "1.0.156" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71f2b4817415c6d4210bfe1c7bfcf4801b2d904cb4d0e1a8fdb651013c9e86b8" +checksum = "314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4" dependencies = [ "serde_derive", ] @@ -7033,9 +7026,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.155" +version = "1.0.156" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d071a94a3fac4aff69d023a7f411e33f40f3483f8c5190b1953822b6b76d7630" +checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d" dependencies = [ "proc-macro2", "quote", @@ -7724,12 +7717,12 @@ dependencies = [ [[package]] name = "thrift_codec" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb61fb3d0a0af14949f3a6949b2639112e13226647112824f4d081533f9b1a8" +checksum = "fce3200b189fd4733eb2bb22235755c8aa0361ba1c66b67db54893144d147279" dependencies = [ "byteorder", - "trackable 0.2.24", + "trackable", ] [[package]] @@ -7980,15 +7973,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "toml" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" -dependencies = [ - "serde", -] - [[package]] name = "toml" version = "0.5.11" @@ -8021,9 +8005,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.6" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08de71aa0d6e348f070457f85af8bd566e2bc452156a423ddf22861b3a953fae" +checksum = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274" dependencies = [ "indexmap", "serde", @@ -8107,7 +8091,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bytes", "futures-core", "futures-util", @@ -8226,16 +8210,6 @@ dependencies = [ "tracing-log", ] -[[package]] -name = "trackable" -version = "0.2.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98abb9e7300b9ac902cc04920945a874c1973e08c310627cc4458c04b70dd32" -dependencies = [ - "trackable 1.2.0", - "trackable_derive", -] - [[package]] name = "trackable" version = "1.2.0" @@ -8280,7 +8254,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", - "rand 0.7.3", + "rand 0.8.5", "static_assertions", ] @@ -8321,9 +8295,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.11" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" @@ -8457,12 +8431,11 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] @@ -8742,9 +8715,9 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "winnow" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee7b2c67f962bf5042bfd8b6a916178df33a26eec343ae064cb8e069f638fa6f" +checksum = "23d020b441f92996c80d94ae9166e8501e59c7bb56121189dc9eab3bd8216966" dependencies = [ "memchr", ] @@ -8799,7 +8772,6 @@ dependencies = [ "anyhow", "arrayvec", "auto_enums", - "auto_enums_derive", "aws-sdk-s3", "aws-smithy-client", "aws-types", @@ -8807,7 +8779,7 @@ dependencies = [ "bytes", "cc", "chrono", - "clap 4.1.8", + "clap 4.1.11", "combine", "criterion", "crossbeam-channel", diff --git a/src/bench/Cargo.toml b/src/bench/Cargo.toml index 9e51911755b1..66381379cf4d 100644 --- a/src/bench/Cargo.toml +++ b/src/bench/Cargo.toml @@ -44,7 +44,7 @@ tokio = { version = "0.2", package = "madsim-tokio", features = [ "signal", ] } tokio-stream = "0.1" -toml = "0.5" +toml = "0.7" tracing = "0.1" tracing-opentelemetry = { version = "0.17", optional = true } tracing-subscriber = "0.3.16" diff --git a/src/common/Cargo.toml b/src/common/Cargo.toml index df19a127b985..e9f9d8ff44b6 100644 --- a/src/common/Cargo.toml +++ b/src/common/Cargo.toml @@ -19,8 +19,8 @@ arc-swap = "1" arrow-array = "34" arrow-schema = "34" async-trait = "0.1" -auto_enums = "0.7" -bitflags = "1.3.2" +auto_enums = "0.8" +bitflags = "2" byteorder = "1" bytes = "1" chrono = { version = "0.4", default-features = false, features = [ @@ -75,7 +75,7 @@ tokio = { version = "0.2", package = "madsim-tokio", features = [ "time", "signal", ] } -toml = "0.5" +toml = "0.7" tonic = { version = "0.2", package = "madsim-tonic" } tracing = "0.1" url = "2" diff --git a/src/common/src/constants.rs b/src/common/src/constants.rs index 6c15e62fb06b..b8d54506ad3c 100644 --- a/src/common/src/constants.rs +++ b/src/common/src/constants.rs @@ -13,6 +13,8 @@ // limitations under the License. pub mod hummock { + #![expect(clippy::disallowed_methods, reason = "used by bitflags!")] + use bitflags::bitflags; bitflags! { diff --git a/src/common/src/util/value_encoding/column_aware_row_encoding.rs b/src/common/src/util/value_encoding/column_aware_row_encoding.rs index 7507be331a26..a425cb884259 100644 --- a/src/common/src/util/value_encoding/column_aware_row_encoding.rs +++ b/src/common/src/util/value_encoding/column_aware_row_encoding.rs @@ -19,6 +19,8 @@ //! We have a `Serializer` and a `Deserializer` for each schema of `Row`, which can be reused //! until schema changes +#![expect(clippy::disallowed_methods, reason = "used by bitflags!")] + use std::collections::BTreeMap; use std::sync::Arc; @@ -38,6 +40,7 @@ use crate::row::Row; // } bitflags! { + #[derive(Debug, Clone, Copy, PartialEq, Eq)] struct Flag: u8 { const EMPTY = 0b_1000_0000; const OFFSET8 = 0b01; @@ -133,7 +136,7 @@ impl Serializer { let mut row_bytes = Vec::with_capacity( 5 + self.encoded_column_ids.len() + encoding.offsets.len() + encoding.buf.len(), /* 5 comes from u8+u32 */ ); - row_bytes.put_u8(encoding.flag.bits); + row_bytes.put_u8(encoding.flag.bits()); row_bytes.put_u32_le(self.datum_num); row_bytes.extend(&self.encoded_column_ids); row_bytes.extend(&encoding.offsets); @@ -182,7 +185,7 @@ impl ValueRowDeserializer for Deserializer { Flag::OFFSET8 => 1, Flag::OFFSET16 => 2, Flag::OFFSET32 => 4, - _ => return Err(ValueEncodingError::InvalidFlag(flag.bits)), + _ => return Err(ValueEncodingError::InvalidFlag(flag.bits())), }; let datum_num = encoded_bytes.get_u32_le() as usize; let offsets_start_idx = 4 * datum_num; diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml index eff21690d37c..4cbee5101040 100644 --- a/src/storage/Cargo.toml +++ b/src/storage/Cargo.toml @@ -16,7 +16,7 @@ normal = ["workspace-hack"] [dependencies] arc-swap = "1" async-trait = "0.1" -auto_enums = { version = "0.7", features = ["futures"] } +auto_enums = { version = "0.8", features = ["futures03"] } await-tree = "0.1.1" bytes = { version = "1", features = ["serde"] } crossbeam = "0.8.1" diff --git a/src/storage/src/table/batch_table/storage_table.rs b/src/storage/src/table/batch_table/storage_table.rs index f13b51479407..56458b2be63c 100644 --- a/src/storage/src/table/batch_table/storage_table.rs +++ b/src/storage/src/table/batch_table/storage_table.rs @@ -479,7 +479,7 @@ impl StorageTableInner { })) .await?; - #[auto_enum(futures::Stream)] + #[auto_enum(futures03::Stream)] let iter = match iterators.len() { 0 => unreachable!(), 1 => iterators.into_iter().next().unwrap(), diff --git a/src/tests/state_cleaning_test/Cargo.toml b/src/tests/state_cleaning_test/Cargo.toml index 9129a282ecf9..738b4108b82e 100644 --- a/src/tests/state_cleaning_test/Cargo.toml +++ b/src/tests/state_cleaning_test/Cargo.toml @@ -26,7 +26,7 @@ serde_with = "2" tokio = { version = "0.2", package = "madsim-tokio" } tokio-postgres = "0.7.7" tokio-stream = { version = "0.1", features = ["fs"] } -toml = "0.4" +toml = "0.7" tracing = "0.1" [target.'cfg(not(madsim))'.dependencies] diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index 1425899a4286..d38c1ada7798 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -21,7 +21,6 @@ publish = false ahash = { version = "0.8" } anyhow = { version = "1", features = ["backtrace"] } arrayvec = { version = "0.7", default-features = false, features = ["std"] } -auto_enums = { version = "0.7", features = ["futures"] } aws-sdk-s3 = { version = "0.21", features = ["native-tls"] } aws-smithy-client = { version = "0.51", default-features = false, features = ["native-tls", "rustls"] } aws-types = { version = "0.51", default-features = false, features = ["hardcoded-credentials"] } @@ -112,8 +111,7 @@ zstd-sys = { version = "2", default-features = false, features = ["legacy", "std ahash = { version = "0.8" } anyhow = { version = "1", features = ["backtrace"] } arrayvec = { version = "0.7", default-features = false, features = ["std"] } -auto_enums = { version = "0.7", features = ["futures"] } -auto_enums_derive = { version = "0.7", default-features = false, features = ["futures", "std"] } +auto_enums = { version = "0.8", features = ["futures03"] } aws-sdk-s3 = { version = "0.21", features = ["native-tls"] } aws-smithy-client = { version = "0.51", default-features = false, features = ["native-tls", "rustls"] } aws-types = { version = "0.51", default-features = false, features = ["hardcoded-credentials"] }