diff --git a/Cargo.lock b/Cargo.lock index 433bac8..9bb093a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,11 +4,11 @@ version = 3 [[package]] name = "actix-codec" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "617a8268e3537fe1d8c9ead925fca49ef6400927ee7bc26750e90ecee14ce4b8" +checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a" dependencies = [ - "bitflags 1.3.2", + "bitflags", "bytes", "futures-core", "futures-sink", @@ -21,17 +21,17 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.3.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2079246596c18b4a33e274ae10c0e50613f4d32a4198e09c7b93771013fed74" +checksum = "d48f96fc3003717aeb9856ca3d02a8c7de502667ad76eeacd830b48d2e91fac4" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-utils", - "ahash 0.8.3", + "ahash", "base64", - "bitflags 1.3.2", + "bitflags", "brotli", "bytes", "bytestring", @@ -65,27 +65,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.27", + "syn", ] [[package]] name = "actix-router" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66ff4d247d2b160861fa2866457e85706833527840e4133f8f49aa423a38799" +checksum = "13d324164c51f63867b57e73ba5936ea151b8a41a1d23d1031eeb9f70d0236f8" dependencies = [ "bytestring", + "cfg-if", "http", "regex", + "regex-lite", "serde", "tracing", ] [[package]] name = "actix-rt" -version = "2.8.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15265b6b8e2347670eb363c47fc8c75208b4a4994b27192f345fcbe707804f3e" +checksum = "24eda4e2a6e042aa4e55ac438a2ae052d3b5da0ecf83d7411e1a368946925208" dependencies = [ "futures-core", "tokio", @@ -93,9 +95,9 @@ dependencies = [ [[package]] name = "actix-server" -version = "2.2.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e8613a75dd50cc45f473cee3c34d59ed677c0f7b44480ce3b8247d7dc519327" +checksum = "7ca2549781d8dd6d75c40cf6b6051260a2cc2f3c62343d761a969a0640646894" dependencies = [ "actix-rt", "actix-service", @@ -103,7 +105,6 @@ dependencies = [ "futures-core", "futures-util", "mio", - "num_cpus", "socket2", "tokio", "tracing", @@ -132,9 +133,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.3.1" +version = "4.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3cb42f9566ab176e1ef0b8b3a896529062b4efc6be0123046095914c4c1c96" +checksum = "9180d76e5cc7ccbc4d60a506f2c727730b154010262df5b910eb17dbe4b8cb38" dependencies = [ "actix-codec", "actix-http", @@ -145,7 +146,7 @@ dependencies = [ "actix-service", "actix-utils", "actix-web-codegen", - "ahash 0.7.6", + "ahash", "bytes", "bytestring", "cfg-if", @@ -154,7 +155,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "http", + "impl-more", "itoa", "language-tags", "log", @@ -162,6 +163,7 @@ dependencies = [ "once_cell", "pin-project-lite", "regex", + "regex-lite", "serde", "serde_json", "serde_urlencoded", @@ -173,59 +175,49 @@ dependencies = [ [[package]] name = "actix-web-codegen" -version = "4.2.0" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2262160a7ae29e3415554a3f1fc04c764b1540c116aa524683208078b7a75bc9" +checksum = "f591380e2e68490b5dfaf1dd1aa0ebe78d84ba7067078512b4ea6e4492d622b8" dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "addr2line" -version = "0.20.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "getrandom", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -247,86 +239,87 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.5" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2faccea4cc4ab4a667ce676a30e8ec13922a692c99bb8f5b11f1502c72e04220" +checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", + "windows-targets", ] [[package]] name = "base64" -version = "0.21.2" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bindgen" -version = "0.69.4" +version = "0.69.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" dependencies = [ - "bitflags 2.5.0", + "bitflags", "cexpr", "clang-sys", "itertools", @@ -337,20 +330,14 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.27", + "syn", ] [[package]] name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block-buffer" @@ -363,9 +350,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.3.4" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -374,25 +361,31 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", ] [[package]] -name = "bytes" +name = "byteorder" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "bytestring" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238e4886760d98c4f899360c834fa93e62cf7f721ac3c2da375cbdf4b8679aae" +checksum = "74d80203ea6b29df88012294f62733de21cfeab47f17b41af3a38bc30a03ee72" dependencies = [ "bytes", ] @@ -410,11 +403,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" dependencies = [ "jobserver", + "libc", + "shlex", ] [[package]] @@ -434,9 +429,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", @@ -445,9 +440,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "convert_case" @@ -468,18 +463,18 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -494,17 +489,26 @@ dependencies = [ "typenum", ] +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn", ] [[package]] @@ -519,24 +523,24 @@ dependencies = [ [[package]] name = "either" -version = "1.11.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] [[package]] name = "env_filter" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" dependencies = [ "log", "regex", @@ -544,9 +548,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.1" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e7cf40684ae96ade6232ed84582f40ce0a66efcd43a5117aef610534f8e0b8" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -555,11 +559,17 @@ dependencies = [ "log", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide", @@ -573,36 +583,36 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-core", "futures-task", @@ -622,9 +632,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -633,9 +643,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" @@ -645,9 +655,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.3.20" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -664,21 +674,27 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "http" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -687,15 +703,15 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -705,24 +721,36 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", ] +[[package]] +name = "impl-more" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae21c3177a27788957044151cc2800043d127acaa460a47ebb9b84dfa2c6aa0" + [[package]] name = "indexmap" -version = "1.9.3" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ - "autocfg", + "equivalent", "hashbrown", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" version = "0.12.1" @@ -734,15 +762,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -755,9 +783,9 @@ checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -767,18 +795,18 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "winapi", + "windows-targets", ] [[package]] @@ -799,9 +827,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.9" +version = "1.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" dependencies = [ "cc", "pkg-config", @@ -810,27 +838,26 @@ dependencies = [ [[package]] name = "local-channel" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f303ec0e94c6c54447f84f3b0ef7af769858a9c4ef56ef2a986d3dcd4c3fc9c" +checksum = "b6cbc85e69b8df4b8bb8b89ec634e7189099cea8927a276b7384ce5488e53ec8" dependencies = [ "futures-core", "futures-sink", - "futures-util", "local-waker", ] [[package]] name = "local-waker" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34f76eb3611940e0e7d53a9aaa4e6a3151f69541a282fd0dad5571420c53ff1" +checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -838,15 +865,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lz4-sys" -version = "1.9.4" +version = "1.11.1+lz4-1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" +checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6" dependencies = [ "cc", "libc", @@ -854,9 +881,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "mime" @@ -872,23 +899,24 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] [[package]] name = "mio" -version = "0.8.8" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ + "hermit-abi", "libc", "log", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -901,6 +929,12 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num_cpus" version = "1.16.0" @@ -913,24 +947,24 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -938,34 +972,34 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.1", + "windows-targets", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -975,30 +1009,39 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.32" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -1035,18 +1078,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] name = "regex" -version = "1.9.1" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -1056,20 +1099,26 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", "regex-syntax", ] +[[package]] +name = "regex-lite" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" + [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rocksdb" @@ -1081,11 +1130,26 @@ dependencies = [ "librocksdb-sys", ] +[[package]] +name = "rocksdb-client" +version = "0.1.6" +source = "git+https://github.com/mpwsh/rocksdb-client#d9053401817bbe37fa77a2811bc9aba39c407d2c" +dependencies = [ + "bytes", + "hex", + "log", + "rocksdb", + "serde", + "serde_json", + "sha1", + "thiserror", +] + [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -1095,18 +1159,18 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "scopeguard" @@ -1116,23 +1180,38 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "semver" -version = "1.0.18" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.180" +version = "1.0.213" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed" +checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.213" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -1162,63 +1241,67 @@ dependencies = [ [[package]] name = "shlex" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.11.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smol-kv" -version = "0.1.1" +version = "0.2.0" dependencies = [ "actix-web", "bytes", "env_logger", + "hex", "log", + "num_cpus", "rand", - "rocksdb", + "rocksdb-client", + "serde", "serde_json", "sha1", + "thiserror", ] [[package]] name = "socket2" -version = "0.4.9" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "winapi", + "windows-sys 0.52.0", ] [[package]] name = "syn" -version = "1.0.109" +version = "2.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" dependencies = [ "proc-macro2", "quote", @@ -1226,23 +1309,35 @@ dependencies = [ ] [[package]] -name = "syn" -version = "2.0.27" +name = "thiserror" +version = "1.0.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", - "unicode-ident", + "syn", ] [[package]] name = "time" -version = "0.3.23" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ + "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -1250,24 +1345,25 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.10" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -1280,11 +1376,10 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", @@ -1293,30 +1388,28 @@ dependencies = [ "pin-project-lite", "signal-hook-registry", "socket2", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-core", @@ -1324,45 +1417,45 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "url" -version = "2.4.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -1371,9 +1464,9 @@ dependencies = [ [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "vcpkg" @@ -1383,9 +1476,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "wasi" @@ -1393,186 +1486,133 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.1", -] - [[package]] name = "windows-sys" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets", ] [[package]] -name = "windows-targets" -version = "0.48.1" +name = "windows-sys" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows-targets", ] [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] -name = "windows_i686_gnu" -version = "0.52.0" +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.0" +name = "windows_x86_64_msvc" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" +name = "zerocopy" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] [[package]] -name = "windows_x86_64_msvc" -version = "0.52.0" +name = "zerocopy-derive" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] [[package]] name = "zstd" -version = "0.12.4" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "6.0.6" +version = "7.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.13+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/Cargo.toml b/Cargo.toml index 9c632a2..e6debac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,15 +1,19 @@ [package] name = "smol-kv" -version = "0.1.1" -authors = ["Uk ", "mpw "] +version = "0.2.0" +authors = ["mpw "] edition = "2021" [dependencies] +rocksdb-client = { git = "https://github.com/mpwsh/rocksdb-client" } +sha1 = "0.10.6" bytes = "1.5.0" env_logger = "0.11.1" serde_json = "1.0.104" -rocksdb = { version = "0.22.0", features = ["multi-threaded-cf"] } +thiserror = "1.0.61" +serde = { version = "1.0.203", features = ["derive"] } actix-web = "4.3.1" -log = "0.4.19" -sha1 = "0.10.6" +log = "0.4.22" rand = "0.8" +hex = "0.4.3" +num_cpus = "1.16.0" diff --git a/benchmark/k6.js b/benchmark/k6.js new file mode 100644 index 0000000..819b146 --- /dev/null +++ b/benchmark/k6.js @@ -0,0 +1,74 @@ +import http from "k6/http"; +import { sleep } from "k6"; +import { randomIntBetween, randomItem } from "https://jslib.k6.io/k6-utils/1.2.0/index.js"; + +export let options = { + scenarios: { + players: { + executor: 'constant-vus', + vus: 50, + duration: '30s', + }, + }, +}; + +const playerStates = [ + "Idle", + "Moving", + "Dashing", + "PreparingPrimary", + "CastingPrimary", + "PreparingSecondary", + "CastingSecondary", + "Resting", + "Meditating", + "Dead", +]; + +function generateRandomPlayerBundle(playerId) { + return { + player: playerId, + name: `Player${playerId}`, + health: Math.random() * 100, + mana: Math.random() * 250, + position: Math.random() * 100, + size: Math.random() * 10, + state: randomItem(playerStates), + angle: Math.random() * 360, + color: Math.random(), + winner: Math.random() < 0.5, + rounds_won: randomIntBetween(0, 10), + points: randomIntBetween(-100, 100), + }; +} + +export default function () { + const playerId = parseInt(__VU); + const params = { headers: { "Content-Type": "application/json" } }; + let matchId = "test-match" + + //Create collection + http.post( + `http://127.0.0.1:5050/api/${matchId}`, + params + ); + while (true) { + const startTime = new Date().getTime(); + + const playerBundle = generateRandomPlayerBundle(playerId); + + // Save Player data + http.post( + `http://127.0.0.1:5050/api/${matchId}/${playerId}`, + JSON.stringify(playerBundle), + params + ); + + const endTime = new Date().getTime(); + const executionTime = endTime - startTime; + + // Calculate sleep time to maintain 128 Hz (7.8125 ms per tick) plus 10 ms delay + const sleepTime = Math.max(0, 7.8125 - executionTime); + sleep(sleepTime / 1000); // sleep function takes seconds, not milliseconds + } +} diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 783f5e6..8293053 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.77.2" +channel = "1.82.0" components = [ "cargo", "clippy", diff --git a/src/benchmark.rs b/src/benchmark.rs new file mode 100644 index 0000000..30fd410 --- /dev/null +++ b/src/benchmark.rs @@ -0,0 +1,217 @@ +use crate::kv::{KVStore, RocksDB}; +use rand::{distributions::Alphanumeric, Rng}; + +use actix_web::{ + web::{Data, Query}, + HttpRequest, HttpResponse, +}; +use serde_json::json; + +use serde::Deserialize; +use std::time::Instant; + +#[derive(Deserialize)] +pub struct BenchmarkParams { + count: usize, // Number of operations to perform + size: usize, // Size of each value in bytes + #[serde(default = "default_batch_size")] + batch_size: usize, // Optional: How many operations per batch +} + +fn default_batch_size() -> usize { + 100 +} + +fn generate(id: usize) -> serde_json::Value { + let status = ["active", "inactive", "pending"]; + let types = ["user", "admin", "guest"]; + let mut rng = rand::thread_rng(); + + json!({ + "id": format!("user_{}", id), + "type": types[rng.gen_range(0..3)], + "status": status[rng.gen_range(0..3)], + "data": { + "name": format!("User {}", id), + "email": format!("user{}@example.com", id), + "age": rng.gen_range(18..80), + "verified": rng.gen_bool(0.7) + }, + "metadata": { + "last_login": format!("2024-{:02}-{:02}T{:02}:{:02}:{:02}Z", + rng.gen_range(1..13), + rng.gen_range(1..29), + rng.gen_range(0..24), + rng.gen_range(0..60), + rng.gen_range(0..60) + ), + "created_at": "2024-10-26T20:00:00Z", + "login_count": rng.gen_range(0..1000) + } + }) +} + +pub async fn start( + db: Data, + token: Data, + params: Query, + req: HttpRequest, +) -> HttpResponse { + // Auth check + let token_header = req + .headers() + .get("Authorization") + .and_then(|hv| hv.to_str().ok()); + if token_header.is_none() || token_header != Some(token.get_ref().as_str()) { + return HttpResponse::Unauthorized().finish(); + } + // Generate test data with realistic JSON + let random_data = (0..params.count) + .map(|i| { + let value = generate(i); + (format!("bench_key_{}", i), value) + }) + .collect::>(); + + let start_total = Instant::now(); + let mut metrics = json!({ + "params": { + "count": params.count, + "size": params.size, + "batch_size": params.batch_size + }, + "operations": { + "writes": { "count": 0, "success": 0, "duration_ms": 0 }, + "reads": { "count": 0, "success": 0, "duration_ms": 0 }, + "deletes": { "count": 0, "success": 0, "duration_ms": 0 } + }, + "throughput": { + "writes_per_sec": 0.0, + "reads_per_sec": 0.0, + "mb_written_per_sec": 0.0 + }, + "total_duration_ms": 0, + "total_data_written_mb": 0.0 + }); + + // Print sample data size + if let Ok(sample_json) = serde_json::to_vec(&random_data[0].1) { + metrics["data_sample"] = json!({ + "example": random_data[0].1.clone(), + "size_bytes": sample_json.len() + }); + } + // Generate test data once + let random_data = (0..params.count) + .map(|i| { + let value: String = rand::thread_rng() + .sample_iter(&Alphanumeric) + .take(params.size) + .map(char::from) + .collect(); + + (format!("bench_key_{}", i), value) + }) + .collect::>(); + + let total_data_size = params.count * params.size; + + // Perform writes in batches + let write_start = Instant::now(); + for chunk in random_data.chunks(params.batch_size) { + let batch_items: Vec<_> = chunk.iter().map(|(k, v)| (k.as_str(), v)).collect(); + + if db.batch_insert(&batch_items).is_ok() { + metrics["operations"]["writes"]["success"] = json!( + metrics["operations"]["writes"]["success"].as_u64().unwrap() + + batch_items.len() as u64 + ); + } + metrics["operations"]["writes"]["count"] = json!( + metrics["operations"]["writes"]["count"].as_u64().unwrap() + batch_items.len() as u64 + ); + } + let write_duration = write_start.elapsed(); + metrics["operations"]["writes"]["duration_ms"] = json!(write_duration.as_millis()); + + // Perform reads + let read_start = Instant::now(); + for (key, _) in &random_data { + if db.find(key).is_ok() { + metrics["operations"]["reads"]["success"] = + json!(metrics["operations"]["reads"]["success"].as_u64().unwrap() + 1); + } + metrics["operations"]["reads"]["count"] = + json!(metrics["operations"]["reads"]["count"].as_u64().unwrap() + 1); + } + let read_duration = read_start.elapsed(); + metrics["operations"]["reads"]["duration_ms"] = json!(read_duration.as_millis()); + + // Perform deletes + let delete_start = Instant::now(); + for (key, _) in &random_data { + if db.delete(key).is_ok() { + metrics["operations"]["deletes"]["success"] = json!( + metrics["operations"]["deletes"]["success"] + .as_u64() + .unwrap() + + 1 + ); + } + metrics["operations"]["deletes"]["count"] = + json!(metrics["operations"]["deletes"]["count"].as_u64().unwrap() + 1); + } + let delete_duration = delete_start.elapsed(); + metrics["operations"]["deletes"]["duration_ms"] = json!(delete_duration.as_millis()); + + // Calculate throughput metrics + let writes_per_sec = params.count as f64 / write_duration.as_secs_f64(); + let reads_per_sec = params.count as f64 / read_duration.as_secs_f64(); + let total_duration_secs = start_total.elapsed().as_secs_f64(); + let total_ops = params.count as f64 * 3.0; // total operations (writes + reads + deletes) + let total_ops_per_sec = total_ops / total_duration_secs; + let mb_written = total_data_size as f64 / (1024.0 * 1024.0); + let mb_per_sec = mb_written / write_duration.as_secs_f64(); + + // Create metrics without the duplicate fields + let metrics = json!({ + "params": { + "count": params.count, + "size": params.size, + "batch_size": params.batch_size + }, + "operations": { + "writes": { + "count": metrics["operations"]["writes"]["count"], + "success": metrics["operations"]["writes"]["success"], + "duration_ms": write_duration.as_millis() + }, + "reads": { + "count": metrics["operations"]["reads"]["count"], + "success": metrics["operations"]["reads"]["success"], + "duration_ms": read_duration.as_millis() + }, + "deletes": { + "count": metrics["operations"]["deletes"]["count"], + "success": metrics["operations"]["deletes"]["success"], + "duration_ms": delete_duration.as_millis() + } + }, + "sample_size": metrics["data_sample"], + "throughput": { + "writes_per_sec": writes_per_sec, + "reads_per_sec": reads_per_sec, + "mb_written_per_sec": mb_per_sec, + "total_ops_per_sec": total_ops_per_sec + }, + "totals": { + "duration_secs": total_duration_secs, + "duration_ms": start_total.elapsed().as_millis(), + "operations": total_ops, + "data_written_mb": mb_written + } + }); + HttpResponse::Ok() + .content_type("application/json") + .body(metrics.to_string()) +} diff --git a/src/collection.rs b/src/collection.rs new file mode 100644 index 0000000..2c2bdc7 --- /dev/null +++ b/src/collection.rs @@ -0,0 +1,86 @@ +use crate::kv::{KVStore, KvStoreError, RocksDB}; +use actix_web::{ + web::{Data, Path, Query}, + HttpResponse, Responder, +}; +use log::{error, info}; +use serde::Deserialize; + +use serde_json::{json, Value}; + +#[derive(Deserialize)] +pub struct RangeQuery { + from: Option, + to: Option, +} +pub async fn exists(name: Path, db: Data) -> impl Responder { + if db.cf_exists(&name) { + HttpResponse::Ok().finish() + } else { + HttpResponse::NotFound().finish() + } +} + +pub async fn create(name: Path, db: Data) -> impl Responder { + info!("Received request to create collection: {}", name); + match db.create_cf(&name) { + Ok(_) => { + info!("Collection '{}' created successfully", name); + HttpResponse::Created().json(json!({ + "message": "Collection created successfully", + "collection": name.to_string() + })) + } + Err(KvStoreError::InvalidColumnFamily(_)) => { + info!("Attempted to create existing collection: {}", name); + HttpResponse::Conflict().json(json!({ + "error": "Collection already exists", + "collection": name.to_string() + })) + } + Err(e) => { + error!("Failed to create collection '{}': {:?}", name, e); + HttpResponse::InternalServerError().json(json!({ + "error": "Failed to create collection", + "details": format!("{:?}", e), + "collection": name.to_string() + })) + } + } +} + +pub async fn drop(name: Path, db: Data) -> HttpResponse { + match db.drop_cf(&name) { + Ok(_) => HttpResponse::Ok() + .content_type("application/json") + .body(json!({ "message": "Collection dropped successfully" }).to_string()), + Err(KvStoreError::InvalidColumnFamily(_)) => HttpResponse::NotFound() + .content_type("application/json") + .body(json!({ "error": "Collection not found" }).to_string()), + Err(_) => HttpResponse::InternalServerError() + .content_type("application/json") + .body(json!({ "error": "Failed to drop collection" }).to_string()), + } +} + +pub async fn list( + collection: Path, + query: Query, + db: Data, +) -> HttpResponse { + let collection = collection.into_inner(); + + let from = query.from.as_deref().unwrap_or(""); + let to = query.to.as_deref().unwrap_or("\u{fff0}"); + match db.get_range_cf::(&collection, from, to) { + Ok(items) => HttpResponse::Ok() + .content_type("application/json") + .body(serde_json::to_string(&items).unwrap()), + Err(KvStoreError::InvalidColumnFamily(_)) => HttpResponse::NotFound() + .content_type("application/json") + .body(json!({ "error": "Collection not found" }).to_string()), + Err(_) => HttpResponse::InternalServerError() + .content_type("application/json") + .body(json!({ "error": "Internal server error" }).to_string()), + } +} diff --git a/src/key.rs b/src/key.rs new file mode 100644 index 0000000..5247bed --- /dev/null +++ b/src/key.rs @@ -0,0 +1,77 @@ +use crate::kv::{KVStore, KvStoreError, RocksDB}; + +use actix_web::{ + web::{Data, Path}, + HttpResponse, Responder, +}; +use bytes::Bytes; +use serde_json::{json, Value}; + +pub async fn head(path: Path<(String, String)>, db: Data) -> impl Responder { + let (collection, key) = path.into_inner(); + match db.get_cf::(&collection, &key) { + Ok(_) => HttpResponse::Ok().finish(), + Err(KvStoreError::KeyNotFound(_)) => HttpResponse::NotFound().finish(), + Err(KvStoreError::InvalidColumnFamily(_)) => HttpResponse::NotFound().finish(), + Err(_) => HttpResponse::InternalServerError().finish(), + } +} + +pub async fn get(path: Path<(String, String)>, db: Data) -> HttpResponse { + let (collection, key) = path.into_inner(); + match db.get_cf::(&collection, &key) { + Ok(timestamped_value) => HttpResponse::Ok() + .content_type("application/json") + .body(serde_json::to_string(×tamped_value).unwrap()), + Err(KvStoreError::KeyNotFound(_)) => HttpResponse::NotFound() + .content_type("application/json") + .body(json!({ "error": "Item not found" }).to_string()), + Err(KvStoreError::InvalidColumnFamily(_)) => HttpResponse::NotFound() + .content_type("application/json") + .body(json!({ "error": "Collection not found" }).to_string()), + Err(_) => HttpResponse::InternalServerError() + .content_type("application/json") + .body(json!({ "error": "Internal server error" }).to_string()), + } +} + +pub async fn post(path: Path<(String, String)>, db: Data, body: Bytes) -> HttpResponse { + let (collection, key) = path.into_inner(); + match serde_json::from_slice::(&body) { + Ok(obj) => match db.insert_cf(&collection, &key, &obj) { + Ok(_) => HttpResponse::Ok() + .content_type("application/json") + .body(obj.to_string()), + Err(KvStoreError::InvalidColumnFamily(_)) => HttpResponse::NotFound() + .content_type("application/json") + .body(json!({ "error": "Collection not found" }).to_string()), + Err(_) => HttpResponse::InternalServerError() + .content_type("application/json") + .finish(), + }, + Err(_) => HttpResponse::BadRequest() + .content_type("application/json") + .body( + json!({ "status": 400, "msg": "Parsing failed. Value is not in JSON Format"}) + .to_string(), + ), + } +} + +pub async fn delete(path: Path<(String, String)>, db: Data) -> HttpResponse { + let (collection, key) = path.into_inner(); + match db.delete_cf(&collection, &key) { + Ok(_) => HttpResponse::Ok() + .content_type("application/json") + .body(json!({ "message": "Item deleted successfully" }).to_string()), + Err(KvStoreError::KeyNotFound(_)) => HttpResponse::NotFound() + .content_type("application/json") + .body(json!({ "error": "Item not found" }).to_string()), + Err(KvStoreError::InvalidColumnFamily(_)) => HttpResponse::NotFound() + .content_type("application/json") + .body(json!({ "error": "Collection not found" }).to_string()), + Err(_) => HttpResponse::InternalServerError() + .content_type("application/json") + .finish(), + } +} diff --git a/src/kv.rs b/src/kv.rs deleted file mode 100644 index 4a5fd84..0000000 --- a/src/kv.rs +++ /dev/null @@ -1,44 +0,0 @@ -use rocksdb::DB; -use std::sync::Arc; - -pub trait KVStore { - fn init(file_path: &str) -> Self; - fn save(&self, k: &str, v: &str) -> bool; - fn find(&self, k: &str) -> Option; - fn delete(&self, k: &str) -> bool; -} - -#[derive(Clone)] -pub struct RocksDB { - db: Arc, -} - -impl KVStore for RocksDB { - fn init(file_path: &str) -> Self { - RocksDB { - db: Arc::new(DB::open_default(file_path).unwrap()), - } - } - - fn save(&self, k: &str, v: &str) -> bool { - self.db.put(k.as_bytes(), v.as_bytes()).is_ok() - } - - fn find(&self, k: &str) -> Option { - match self.db.get(k.as_bytes()) { - Ok(Some(v)) => { - let result = String::from_utf8(v).unwrap(); - Some(result) - } - Ok(None) => None, - Err(e) => { - log::error!("Error retrieving value for {}: {}", k, e); - None - } - } - } - - fn delete(&self, k: &str) -> bool { - self.db.delete(k.as_bytes()).is_ok() - } -} diff --git a/src/kv_handler.rs b/src/kv_handler.rs deleted file mode 100644 index 94d540a..0000000 --- a/src/kv_handler.rs +++ /dev/null @@ -1,153 +0,0 @@ -use crate::kv::{KVStore, RocksDB}; -use rand::{distributions::Alphanumeric, Rng}; - -use actix_web::{ - web::{Data, Path}, - HttpRequest, HttpResponse, Responder, -}; -use bytes::Bytes; -use serde_json::{json, Value}; -use sha1::{Digest, Sha1}; - -pub async fn head(key: Path, db: Data) -> impl Responder { - match &db.find(&key.into_inner()) { - Some(_) => HttpResponse::Ok().finish(), - None => HttpResponse::NotFound().finish(), - } -} - -pub async fn get(key: Path, db: Data) -> HttpResponse { - match &db.find(&key.into_inner()) { - Some(v) => serde_json::from_str(v) - .map(|obj: Value| { - HttpResponse::Ok() - .content_type("application/json") - .body(obj.to_string()) - }) - .unwrap_or( - HttpResponse::InternalServerError() - .content_type("application/json") - .finish(), - ), - None => HttpResponse::NotFound() - .content_type("application/json") - .finish(), - } -} - -pub async fn post(key: Path, db: Data, body: Bytes) -> HttpResponse { - serde_json::from_slice(&body.slice(..)) - .map(|obj: Value| { - if db.save(&key.into_inner(), &obj.to_string()) { - HttpResponse::Ok() - .content_type("application/json") - .body(obj.to_string()) - } else { - HttpResponse::InternalServerError() - .content_type("application/json") - .finish() - } - }) - .unwrap_or( - HttpResponse::BadRequest() - .content_type("application/json") - .body( - json!({ "status": 400, "msg": "Parsing failed. value is not in JSON Format"}) - .to_string(), - ), - ) -} - -pub async fn benchmark( - db: Data, - token: Data, - body: Bytes, - req: HttpRequest, -) -> HttpResponse { - let token_header = req - .headers() - .get("Authorization") - .and_then(|hv| hv.to_str().ok()); - - if token_header.is_none() || token_header != Some(token.get_ref().as_str()) { - return HttpResponse::Unauthorized().finish(); - } - // Generate a random string - let random_string: String = rand::thread_rng() - .sample_iter(&Alphanumeric) - .take(10) - .map(char::from) - .collect(); - - // Combine body and random string for SHA1 key - let mut hasher = Sha1::new(); - hasher.update(&body); - hasher.update(random_string.as_bytes()); - let result = hasher.finalize(); - let key = format!("{:x}", result); - - // Save data - match serde_json::from_slice::(&body) { - Ok(obj) => { - if !db.save(&key, &obj.to_string()) { - return HttpResponse::InternalServerError().finish(); - } - - // Read data - match db.find(&key) { - Some(_) => { - // Delete data - if !db.delete(&key) { - return HttpResponse::InternalServerError().finish(); - } - - // Respond with the key and data - HttpResponse::Ok() - .content_type("application/json") - .body(json!({ "key": key, "data": obj }).to_string()) - } - None => HttpResponse::NotFound().finish(), - } - } - Err(_) => HttpResponse::BadRequest() - .content_type("application/json") - .body(json!({ "status": 400, "msg": "Invalid JSON format"}).to_string()), - } -} - -pub async fn new(db: Data, body: Bytes) -> impl Responder { - let mut hasher = Sha1::new(); - hasher.update(&body); - - let result = hasher.finalize(); - let key = format!("{:x}", result); - - serde_json::from_slice(&body.slice(..)) - .map(|obj: Value| { - if db.save(&key, &obj.to_string()) { - HttpResponse::Ok() - .content_type("application/json") - .body(json!({ "key": key, "data": obj }).to_string()) - } else { - HttpResponse::InternalServerError() - .content_type("application/json") - .finish() - } - }) - .unwrap_or( - HttpResponse::BadRequest() - .content_type("application/json") - .body( - json!({ "status": 400, "msg": "Parsing failed. value is not in JSON Format"}) - .to_string(), - ), - ) -} -pub async fn delete(key: Path, db: Data) -> HttpResponse { - match &db.delete(&key.into_inner()) { - true => HttpResponse::Ok().content_type("application/json").finish(), - false => HttpResponse::InternalServerError() - .content_type("application/json") - .finish(), - } -} diff --git a/src/main.rs b/src/main.rs index ed9e37b..d0498ba 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,7 @@ -mod kv; -mod kv_handler; +mod benchmark; +mod collection; +mod key; +pub use rocksdb_client as kv; #[actix_web::main] async fn main() -> std::io::Result<()> { @@ -17,10 +19,15 @@ async fn main() -> std::io::Result<()> { .unwrap_or("4".to_string()) .parse::() .unwrap(); + let token = std::env::var("ADMIN_TOKEN").unwrap_or("supersecret".to_string()); let db_path = std::env::var("DATABABASE_PATH").unwrap_or("./rocksdb".to_string()); let log_level = std::env::var("LOG_LEVEL").unwrap_or("info".to_string()); - let db: kv::RocksDB = kv::KVStore::init(&db_path); + + let opts = config_db(); + let db: kv::RocksDB = + kv::KVStore::open_with_existing_cfs(&opts, &db_path).expect("Failed to open database"); + std::env::set_var( "RUST_LOG", format!("{0},actix_web={0},actix_server={0}", log_level), @@ -37,18 +44,63 @@ async fn main() -> std::io::Result<()> { .service( scope("/api") .service( - resource("/{key}") - .route(get().to(kv_handler::get)) - .route(head().to(kv_handler::head)) - .route(post().to(kv_handler::post)) - .route(delete().to(kv_handler::delete)), + resource("/{name}") + .route(head().to(collection::exists)) + .route(delete().to(collection::drop)) + .route(post().to(collection::create)) + .route(get().to(collection::list)), ) - .service(resource("").route(post().to(kv_handler::new))), + .service( + resource("/{collection}/{key}") + .route(get().to(key::get)) + .route(head().to(key::head)) + .route(post().to(key::post)) + .route(delete().to(key::delete)), + ), ) - .service(resource("/benchmark").route(post().to(kv_handler::benchmark))) + .service(resource("/benchmark").route(get().to(benchmark::start))) }) .bind(("0.0.0.0", port))? .workers(workers) .run() .await } + +fn config_db() -> kv::Options { + let mut opts = kv::Options::default(); + + // Basic options + opts.create_if_missing(true); + opts.create_missing_column_families(true); + + // Write performance + opts.set_write_buffer_size(256 * 1024 * 1024); // 256MB write buffer + opts.set_max_write_buffer_number(6); // Allow more write buffers + opts.set_min_write_buffer_number_to_merge(2); + + // Read performance + opts.set_max_open_files(-1); // Keep all files open, good for production + opts.set_use_direct_io_for_flush_and_compaction(true); + opts.set_use_direct_reads(false); + + // Parallelism + let cpu_cores = num_cpus::get() as i32; + opts.increase_parallelism(cpu_cores); + opts.set_max_background_jobs(cpu_cores * 2); + + // Compaction settings + opts.set_level_zero_file_num_compaction_trigger(4); + opts.set_target_file_size_base(128 * 1024 * 1024); // 128MB + opts.set_max_bytes_for_level_base(512 * 1024 * 1024); // 512MB + + // Memory settings + opts.set_allow_mmap_reads(true); + opts.set_allow_mmap_writes(false); // mmap writes can be dangerous + opts.set_max_total_wal_size(256 * 1024 * 1024); // 256MB max WAL size + + // Cache settings + let cache_size = 1024 * 1024 * 1024; // 1GB cache + opts.optimize_for_point_lookup(cache_size); + + opts +}