diff --git a/Cargo.lock b/Cargo.lock index f4722112..9c0e1d60 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,17 +52,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom 0.2.16", - "once_cell", - "version_check", -] - [[package]] name = "ahash" version = "0.8.12" @@ -248,12 +237,6 @@ dependencies = [ "password-hash", ] -[[package]] -name = "arraydeque" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" - [[package]] name = "arrayref" version = "0.3.9" @@ -307,7 +290,7 @@ version = "54.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a12fcdb3f1d03f69d3ec26ac67645a8fe3f878d77b5ebb0b15d64a116c212985" dependencies = [ - "ahash 0.8.12", + "ahash", "arrow-buffer", "arrow-data", "arrow-schema", @@ -452,7 +435,7 @@ version = "54.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69efcd706420e52cd44f5c4358d279801993846d1c2a8e52111853d61d55a619" dependencies = [ - "ahash 0.8.12", + "ahash", "arrow-array", "arrow-buffer", "arrow-data", @@ -825,7 +808,7 @@ dependencies = [ "http 0.2.12", "http 1.3.1", "http-body 0.4.6", - "lru 0.12.5", + "lru", "percent-encoding", "regex-lite", "sha2 0.10.9", @@ -1191,6 +1174,15 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" +[[package]] +name = "base62" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10e52a7bcb1d6beebee21fb5053af9e3cbb7a7ed1a4909e534040e676437ab1f" +dependencies = [ + "rustversion", +] + [[package]] name = "base64" version = "0.21.7" @@ -1389,6 +1381,16 @@ dependencies = [ "alloc-stdlib", ] +[[package]] +name = "bstr" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "bumpalo" version = "3.18.1" @@ -1406,6 +1408,9 @@ name = "bytes" version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" +dependencies = [ + "serde", +] [[package]] name = "bytes-utils" @@ -1837,25 +1842,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "config" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595aae20e65c3be792d05818e8c63025294ac3cb7e200f11459063a352a6ef80" -dependencies = [ - "async-trait", - "convert_case 0.6.0", - "json5", - "pathdiff", - "ron", - "rust-ini", - "serde", - "serde_json", - "toml", - "winnow 0.7.10", - "yaml-rust2", -] - [[package]] name = "console_error_panic_hook" version = "0.1.7" @@ -2368,7 +2354,7 @@ dependencies = [ "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.11", + "parking_lot_core", ] [[package]] @@ -2382,7 +2368,7 @@ dependencies = [ "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.11", + "parking_lot_core", ] [[package]] @@ -2429,7 +2415,7 @@ dependencies = [ "itertools 0.14.0", "log", "object_store", - "parking_lot 0.12.4", + "parking_lot", "parquet", "rand 0.8.5", "regex", @@ -2459,7 +2445,7 @@ dependencies = [ "futures", "itertools 0.14.0", "log", - "parking_lot 0.12.4", + "parking_lot", ] [[package]] @@ -2490,7 +2476,7 @@ version = "46.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f53d7ec508e1b3f68bd301cee3f649834fad51eff9240d898a4b2614cfd0a7a" dependencies = [ - "ahash 0.8.12", + "ahash", "arrow", "arrow-ipc", "base64 0.22.1", @@ -2571,7 +2557,7 @@ dependencies = [ "futures", "log", "object_store", - "parking_lot 0.12.4", + "parking_lot", "rand 0.8.5", "tempfile", "url", @@ -2646,7 +2632,7 @@ version = "46.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adfc2d074d5ee4d9354fdcc9283d5b2b9037849237ddecb8942a29144b77ca05" dependencies = [ - "ahash 0.8.12", + "ahash", "arrow", "datafusion-common", "datafusion-doc", @@ -2667,7 +2653,7 @@ version = "46.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cbceba0f98d921309a9121b702bcd49289d383684cccabf9a92cda1602f3bbb" dependencies = [ - "ahash 0.8.12", + "ahash", "arrow", "datafusion-common", "datafusion-expr-common", @@ -2707,7 +2693,7 @@ dependencies = [ "datafusion-common", "datafusion-expr", "datafusion-physical-plan", - "parking_lot 0.12.4", + "parking_lot", "paste", ] @@ -2774,7 +2760,7 @@ version = "46.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1447c2c6bc8674a16be4786b4abf528c302803fafa186aa6275692570e64d85" dependencies = [ - "ahash 0.8.12", + "ahash", "arrow", "datafusion-common", "datafusion-expr", @@ -2796,7 +2782,7 @@ version = "46.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69f8c25dcd069073a75b3d2840a79d0f81e64bdd2c05f2d3d18939afb36a7dcb" dependencies = [ - "ahash 0.8.12", + "ahash", "arrow", "datafusion-common", "datafusion-expr-common", @@ -2829,7 +2815,7 @@ version = "46.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88cc160df00e413e370b3b259c8ea7bfbebc134d32de16325950e9e923846b7f" dependencies = [ - "ahash 0.8.12", + "ahash", "arrow", "arrow-ord", "arrow-schema", @@ -2848,7 +2834,7 @@ dependencies = [ "indexmap 2.9.0", "itertools 0.14.0", "log", - "parking_lot 0.12.4", + "parking_lot", "pin-project-lite", "tokio", ] @@ -3399,7 +3385,7 @@ dependencies = [ "futures-util", "generational-box", "once_cell", - "parking_lot 0.12.4", + "parking_lot", "rustc-hash 1.1.0", "tracing", "warnings", @@ -3532,21 +3518,6 @@ dependencies = [ "syn 2.0.101", ] -[[package]] -name = "dlv-list" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" -dependencies = [ - "const-random", -] - -[[package]] -name = "dotenvy" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" - [[package]] name = "dpi" version = "0.1.2" @@ -3578,6 +3549,7 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" name = "e2e_test" version = "0.0.1" dependencies = [ + "bytes", "common", "ecstore", "flatbuffers 25.2.10", @@ -3616,6 +3588,7 @@ dependencies = [ "async-trait", "aws-sdk-s3", "backon", + "base64 0.22.1", "base64-simd", "blake2", "byteorder", @@ -3628,6 +3601,7 @@ dependencies = [ "enumset", "flatbuffers 25.2.10", "futures", + "futures-util", "glob", "hex-simd", "highway", @@ -3653,7 +3627,6 @@ dependencies = [ "protos", "rand 0.9.1", "reader", - "reed-solomon-erasure", "reed-solomon-simd", "regex", "reqwest", @@ -3676,6 +3649,7 @@ dependencies = [ "siphasher 1.0.1", "smallvec", "std-next", + "temp-env", "tempfile", "thiserror 2.0.12", "time", @@ -4255,7 +4229,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a673cf4fb0ea6a91aa86c08695756dfe875277a912cdbf33db9a9f62d47ed82b" dependencies = [ - "parking_lot 0.12.4", + "parking_lot", "tracing", ] @@ -4425,6 +4399,30 @@ dependencies = [ "x11-dl", ] +[[package]] +name = "globset" +version = "0.4.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata 0.4.9", + "regex-syntax 0.8.5", +] + +[[package]] +name = "globwalk" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" +dependencies = [ + "bitflags 1.3.2", + "ignore", + "walkdir", +] + [[package]] name = "gloo-net" version = "0.6.0" @@ -4599,9 +4597,6 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.8", -] [[package]] name = "hashbrown" @@ -4609,7 +4604,7 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ - "ahash 0.8.12", + "ahash", "allocator-api2", ] @@ -4624,15 +4619,6 @@ dependencies = [ "foldhash", ] -[[package]] -name = "hashlink" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" -dependencies = [ - "hashbrown 0.15.4", -] - [[package]] name = "heck" version = "0.4.1" @@ -4923,6 +4909,7 @@ dependencies = [ "arc-swap", "async-trait", "base64-simd", + "common", "crypto", "ecstore", "futures", @@ -5082,6 +5069,22 @@ dependencies = [ "icu_properties", ] +[[package]] +name = "ignore" +version = "0.4.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" +dependencies = [ + "crossbeam-deque", + "globset", + "log", + "memchr", + "regex-automata 0.4.9", + "same-file", + "walkdir", + "winapi-util", +] + [[package]] name = "include_dir" version = "0.7.4" @@ -5109,7 +5112,6 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", - "serde", ] [[package]] @@ -5120,7 +5122,6 @@ checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" dependencies = [ "equivalent", "hashbrown 0.15.4", - "serde", ] [[package]] @@ -5233,6 +5234,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + [[package]] name = "itertools" version = "0.12.1" @@ -5337,17 +5347,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "json5" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1" -dependencies = [ - "pest", - "pest_derive", - "serde", -] - [[package]] name = "jsonwebtoken" version = "9.3.1" @@ -5707,15 +5706,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3bd0dd2cd90571056fdb71f6275fada10131182f84899f4b2a916e565d81d86" -[[package]] -name = "lru" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" -dependencies = [ - "hashbrown 0.12.3", -] - [[package]] name = "lru" version = "0.12.5" @@ -6122,6 +6112,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "normpath" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed" +dependencies = [ + "windows-sys 0.59.0", +] + [[package]] name = "notify" version = "8.0.0" @@ -6586,7 +6585,7 @@ dependencies = [ "futures", "humantime", "itertools 0.13.0", - "parking_lot 0.12.4", + "parking_lot", "percent-encoding", "snafu", "tokio", @@ -6732,16 +6731,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "ordered-multimap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" -dependencies = [ - "dlv-list", - "hashbrown 0.14.5", -] - [[package]] name = "ordered-stream" version = "0.2.0" @@ -6806,17 +6795,6 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - [[package]] name = "parking_lot" version = "0.12.4" @@ -6824,21 +6802,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" dependencies = [ "lock_api", - "parking_lot_core 0.9.11", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -6860,7 +6824,7 @@ version = "54.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfb15796ac6f56b429fd99e33ba133783ad75b27c36b4b5ce06f1f82cc97754e" dependencies = [ - "ahash 0.8.12", + "ahash", "arrow-array", "arrow-buffer", "arrow-cast", @@ -6940,12 +6904,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "pathdiff" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" - [[package]] name = "pbkdf2" version = "0.12.2" @@ -6981,51 +6939,6 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "pest" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "198db74531d58c70a361c42201efde7e2591e976d518caf7662a47dc5720e7b6" -dependencies = [ - "memchr", - "thiserror 2.0.12", - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d725d9cfd79e87dccc9341a2ef39d1b6f6353d68c4b33c177febbe1a402c97c5" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db7d01726be8ab66ab32f9df467ae8b1148906685bbe75c82d1e65d7f5b3f841" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn 2.0.101", -] - -[[package]] -name = "pest_meta" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9f832470494906d1fca5329f8ab5791cc60beb230c74815dff541cbd2b5ca0" -dependencies = [ - "once_cell", - "pest", - "sha2 0.10.9", -] - [[package]] name = "petgraph" version = "0.7.1" @@ -7294,6 +7207,7 @@ dependencies = [ "arc-swap", "async-trait", "base64-simd", + "common", "crypto", "futures", "ipnetwork", @@ -7589,7 +7503,7 @@ dependencies = [ "derive_builder", "futures", "lazy_static", - "parking_lot 0.12.4", + "parking_lot", "s3s", "snafu", "tokio", @@ -7604,6 +7518,7 @@ checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb" dependencies = [ "memchr", "serde", + "tokio", ] [[package]] @@ -7893,15 +7808,6 @@ dependencies = [ "syn 2.0.101", ] -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.3.5" @@ -7931,21 +7837,6 @@ dependencies = [ "thiserror 2.0.12", ] -[[package]] -name = "reed-solomon-erasure" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7263373d500d4d4f505d43a2a662d475a894aa94503a1ee28e9188b5f3960d4f" -dependencies = [ - "cc", - "libc", - "libm", - "lru 0.7.8", - "parking_lot 0.11.2", - "smallvec", - "spin", -] - [[package]] name = "reed-solomon-simd" version = "3.0.1" @@ -8008,9 +7899,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.12.19" +version = "0.12.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2f8e5513d63f2e5b386eb5106dc67eaf3f84e95258e210489136b8b92ad6119" +checksum = "eabf4c97d9130e2bf606614eb937e86edac8292eaa6f422f995d7e8de1eb1813" dependencies = [ "base64 0.22.1", "bytes", @@ -8025,12 +7916,10 @@ dependencies = [ "hyper 1.6.0", "hyper-rustls 0.27.7", "hyper-util", - "ipnet", "js-sys", "log", "mime", "mime_guess", - "once_cell", "percent-encoding", "pin-project-lite", "quinn", @@ -8148,18 +8037,6 @@ dependencies = [ "serde", ] -[[package]] -name = "ron" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" -dependencies = [ - "base64 0.21.7", - "bitflags 2.9.1", - "serde", - "serde_derive", -] - [[package]] name = "rsa" version = "0.9.8" @@ -8234,14 +8111,57 @@ dependencies = [ ] [[package]] -name = "rust-ini" -version = "0.21.1" +name = "rust-i18n" +version = "3.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e310ef0e1b6eeb79169a1171daf9abcb87a2e17c03bee2c4bb100b55c75409f" +checksum = "fda2551fdfaf6cc5ee283adc15e157047b92ae6535cf80f6d4962d05717dc332" dependencies = [ - "cfg-if", - "ordered-multimap", - "trim-in-place", + "globwalk", + "once_cell", + "regex", + "rust-i18n-macro", + "rust-i18n-support", + "smallvec", +] + +[[package]] +name = "rust-i18n-macro" +version = "3.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22baf7d7f56656d23ebe24f6bb57a5d40d2bce2a5f1c503e692b5b2fa450f965" +dependencies = [ + "glob", + "once_cell", + "proc-macro2", + "quote", + "rust-i18n-support", + "serde", + "serde_json", + "serde_yaml", + "syn 2.0.101", +] + +[[package]] +name = "rust-i18n-support" +version = "3.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "940ed4f52bba4c0152056d771e563b7133ad9607d4384af016a134b58d758f19" +dependencies = [ + "arc-swap", + "base62", + "globwalk", + "itertools 0.11.0", + "lazy_static", + "normpath", + "once_cell", + "proc-macro2", + "regex", + "serde", + "serde_json", + "serde_yaml", + "siphasher 1.0.1", + "toml", + "triomphe", ] [[package]] @@ -8284,6 +8204,7 @@ dependencies = [ "axum", "axum-extra", "axum-server", + "base64 0.22.1", "bytes", "chrono", "clap", @@ -8295,6 +8216,7 @@ dependencies = [ "flatbuffers 25.2.10", "futures", "futures-util", + "hmac 0.12.1", "http 1.3.1", "http-body 1.0.1", "hyper 1.6.0", @@ -8321,8 +8243,8 @@ dependencies = [ "rmp-serde", "rust-embed", "rustfs-config", - "rustfs-event-notifier", "rustfs-filemeta", + "rustfs-notify", "rustfs-obs", "rustfs-rio", "rustfs-utils", @@ -8332,6 +8254,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "sha2 0.10.9", "shadow-rs", "socket2", "thiserror 2.0.12", @@ -8356,42 +8279,17 @@ dependencies = [ name = "rustfs-config" version = "0.0.1" dependencies = [ - "config", "const-str", "serde", "serde_json", ] -[[package]] -name = "rustfs-event-notifier" -version = "0.0.1" -dependencies = [ - "async-trait", - "axum", - "config", - "dotenvy", - "http 1.3.1", - "rdkafka", - "reqwest", - "rumqttc", - "serde", - "serde_json", - "serde_with", - "smallvec", - "strum", - "thiserror 2.0.12", - "tokio", - "tokio-util", - "tracing", - "tracing-subscriber", - "uuid", -] - [[package]] name = "rustfs-filemeta" version = "0.0.1" dependencies = [ "byteorder", + "bytes", "crc32fast", "criterion", "rmp", @@ -8419,6 +8317,7 @@ dependencies = [ "lazy_static", "rfd 0.15.3", "rust-embed", + "rust-i18n", "serde", "serde_json", "sha2 0.10.9", @@ -8427,6 +8326,35 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "rustfs-notify" +version = "0.0.1" +dependencies = [ + "async-trait", + "axum", + "chrono", + "const-str", + "dashmap 6.1.0", + "ecstore", + "form_urlencoded", + "once_cell", + "quick-xml", + "reqwest", + "rumqttc", + "rustfs-utils", + "serde", + "serde_json", + "snap", + "thiserror 2.0.12", + "tokio", + "tracing", + "tracing-subscriber", + "url", + "urlencoding", + "uuid", + "wildmatch", +] + [[package]] name = "rustfs-obs" version = "0.0.1" @@ -8434,6 +8362,7 @@ dependencies = [ "async-trait", "chrono", "flexi_logger", + "lazy_static", "nu-ansi-term 0.50.1", "nvml-wrapper", "opentelemetry", @@ -8466,25 +8395,23 @@ dependencies = [ "aes-gcm", "async-trait", "base64-simd", - "brotli 8.0.1", + "byteorder", "bytes", "crc32fast", "criterion", - "flate2", "futures", "hex-simd", "http 1.3.1", - "lz4", "md-5", "pin-project-lite", "rand 0.9.1", "reqwest", "rustfs-utils", - "snap", + "serde", + "serde_json", "tokio", "tokio-test", "tokio-util", - "zstd", ] [[package]] @@ -8520,8 +8447,12 @@ version = "0.0.1" dependencies = [ "base64-simd", "blake3", + "brotli 8.0.1", + "bytes", "common", "crc32fast", + "flate2", + "futures", "hex-simd", "highway", "hmac 0.12.1", @@ -8529,9 +8460,11 @@ dependencies = [ "hyper-util", "lazy_static", "local-ip-address", + "lz4", "md-5", "netif", "nix 0.30.1", + "rand 0.9.1", "regex", "rustfs-config", "rustls 0.23.27", @@ -8542,11 +8475,15 @@ dependencies = [ "sha1 0.10.6", "sha2 0.10.9", "siphasher 1.0.1", + "snap", + "sysinfo", "tempfile", "tokio", "tracing", + "transform-stream", "url", "winapi", + "zstd", ] [[package]] @@ -9048,33 +8985,16 @@ dependencies = [ ] [[package]] -name = "serde_with" -version = "3.12.0" +name = "serde_yaml" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "base64 0.22.1", - "chrono", - "hex", - "indexmap 1.9.3", "indexmap 2.9.0", + "itoa 1.0.15", + "ryu", "serde", - "serde_derive", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.101", + "unsafe-libyaml", ] [[package]] @@ -9511,7 +9431,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f" dependencies = [ "new_debug_unreachable", - "parking_lot 0.12.4", + "parking_lot", "phf_shared 0.11.3", "precomputed-hash", "serde", @@ -9758,7 +9678,7 @@ dependencies = [ "ndk-sys", "objc", "once_cell", - "parking_lot 0.12.4", + "parking_lot", "raw-window-handle 0.5.2", "raw-window-handle 0.6.2", "scopeguard", @@ -9788,6 +9708,15 @@ version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +[[package]] +name = "temp-env" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45107136c2ddf8c4b87453c02294fd0adf41751796e81e8ba3f7fd951977ab57" +dependencies = [ + "once_cell", +] + [[package]] name = "tempfile" version = "3.20.0" @@ -10019,7 +9948,7 @@ dependencies = [ "bytes", "libc", "mio", - "parking_lot 0.12.4", + "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", @@ -10442,10 +10371,15 @@ dependencies = [ ] [[package]] -name = "trim-in-place" -version = "0.1.7" +name = "triomphe" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" +checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85" +dependencies = [ + "arc-swap", + "serde", + "stable_deref_trait", +] [[package]] name = "try-lock" @@ -10519,12 +10453,6 @@ dependencies = [ "tz-rs", ] -[[package]] -name = "ucd-trie" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" - [[package]] name = "uds_windows" version = "1.1.0" @@ -10576,6 +10504,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + [[package]] name = "untrusted" version = "0.9.0" @@ -10993,6 +10927,15 @@ dependencies = [ "rustix 0.38.44", ] +[[package]] +name = "wildmatch" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68ce1ab1f8c62655ebe1350f589c61e505cf94d385bc6a12899442d9081e71fd" +dependencies = [ + "serde", +] + [[package]] name = "winapi" version = "0.3.9" @@ -11659,17 +11602,6 @@ dependencies = [ "lzma-sys", ] -[[package]] -name = "yaml-rust2" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18b783b2c2789414f8bb84ca3318fc9c2d7e7be1c22907d37839a58dedb369d3" -dependencies = [ - "arraydeque", - "encoding_rs", - "hashlink", -] - [[package]] name = "yoke" version = "0.8.0" diff --git a/Cargo.toml b/Cargo.toml index 2c41ad62..cccc3ebd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,6 @@ members = [ "s3select/api", # S3 Select API interface "s3select/query", # S3 Select query engine "reader", - ] resolver = "2" @@ -91,7 +90,7 @@ derive_builder = "0.20.2" dioxus = { version = "0.6.3", features = ["router"] } dirs = "6.0.0" flatbuffers = "25.2.10" -flexi_logger = { version = "0.30.2", features = ["trc","dont_minimize_extra_stacks"] } +flexi_logger = { version = "0.30.2", features = ["trc", "dont_minimize_extra_stacks"] } form_urlencoded = "1.2.1" futures = "0.3.31" futures-core = "0.3.31" @@ -202,7 +201,6 @@ serde-xml-rs = "0.8.1" serde_urlencoded = "0.7.1" sha1 = "0.10.6" sha2 = "0.10.9" -hmac = "0.12.1" std-next = "0.1.8" siphasher = "1.0.1" smallvec = { version = "1.15.1", features = ["serde"] } diff --git a/ecstore/Cargo.toml b/ecstore/Cargo.toml index 33af4ffd..43bd4733 100644 --- a/ecstore/Cargo.toml +++ b/ecstore/Cargo.toml @@ -61,7 +61,6 @@ base64 = { workspace = true } hmac = { workspace = true } sha2 = { workspace = true } sha1 = { workspace = true } - hex-simd = { workspace = true } path-clean = { workspace = true } tempfile.workspace = true @@ -77,7 +76,6 @@ tower.workspace = true async-channel.workspace = true num = "0.4.3" enumset = "1.1.5" -hmac.workspace = true std-next.workspace = true num_cpus = { workspace = true } rand.workspace = true @@ -93,10 +91,9 @@ urlencoding = { workspace = true } smallvec = { workspace = true } shadow-rs.workspace = true rustfs-filemeta.workspace = true -rustfs-utils ={workspace = true, features=["full"]} +rustfs-utils = { workspace = true, features = ["full"] } rustfs-rio.workspace = true futures-util.workspace = true -serde_urlencoded.workspace = true reader = { workspace = true } [target.'cfg(not(windows))'.dependencies]