From a8fa7582f93f7ade579520f13b299bbbe7637b8e Mon Sep 17 00:00:00 2001 From: Aumetra Weisman Date: Mon, 20 May 2024 20:54:00 +0200 Subject: [PATCH] fix --- Cargo.lock | 68 ++++++++++++------- .../kitsune-wasm-mrf/example-mrf/Cargo.toml | 2 +- lib/athena/src/redis/mod.rs | 16 ++--- 3 files changed, 51 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1328ea4c6..84e97fbae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2536,9 +2536,6 @@ name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] [[package]] name = "heck" @@ -7821,9 +7818,9 @@ dependencies = [ [[package]] name = "wasm-metadata" -version = "0.202.0" +version = "0.208.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "094aea3cb90e09f16ee25a4c0e324b3e8c934e7fd838bfa039aef5352f44a917" +checksum = "0477c12795d0de6243d03e0101e6a21b24a5f2f350f2e2bf9c80da274e68d243" dependencies = [ "anyhow", "indexmap 2.2.6", @@ -7831,8 +7828,8 @@ dependencies = [ "serde_derive", "serde_json", "spdx", - "wasm-encoder 0.202.0", - "wasmparser 0.202.0", + "wasm-encoder 0.208.0", + "wasmparser 0.208.0", ] [[package]] @@ -7930,7 +7927,7 @@ dependencies = [ "syn 2.0.65", "wasmtime-component-util", "wasmtime-wit-bindgen", - "wit-parser", + "wit-parser 0.202.0", ] [[package]] @@ -8127,7 +8124,7 @@ dependencies = [ "anyhow", "heck 0.4.1", "indexmap 2.2.6", - "wit-parser", + "wit-parser 0.202.0", ] [[package]] @@ -8460,9 +8457,9 @@ dependencies = [ [[package]] name = "wit-bindgen" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb4e7653763780be47e38f479e9aa83c768aa6a3b2ed086dc2826fdbbb7e7f5" +checksum = "7f497a5ce965e6cb9929079bb4af633bd88dfb19d0dfc5341580e354947f00b2" dependencies = [ "wit-bindgen-rt", "wit-bindgen-rust-macro", @@ -8470,31 +8467,32 @@ dependencies = [ [[package]] name = "wit-bindgen-core" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b67e11c950041849a10828c7600ea62a4077c01e8af72e8593253575428f91b" +checksum = "7076a12e69af6e1f6093bd16657d7ae61c30cfd3c5f62321046eb863b17ab1e2" dependencies = [ "anyhow", - "wit-parser", + "heck 0.5.0", + "wit-parser 0.208.0", ] [[package]] name = "wit-bindgen-rt" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0780cf7046630ed70f689a098cd8d56c5c3b22f2a7379bbdb088879963ff96" +checksum = "ef83e2f948056d4195b4c2a236a10378b70c8fd7501039c5a106c1a756fa7da6" dependencies = [ "bitflags 2.5.0", ] [[package]] name = "wit-bindgen-rust" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30acbe8fb708c3a830a33c4cb705df82659bf831b492ec6ca1a17a369cfeeafb" +checksum = "7f8ca0dd2aa75452450da1906391aba9d3a43d95fa920e872361ea00acc452a5" dependencies = [ "anyhow", - "heck 0.4.1", + "heck 0.5.0", "indexmap 2.2.6", "wasm-metadata", "wit-bindgen-core", @@ -8503,9 +8501,9 @@ dependencies = [ [[package]] name = "wit-bindgen-rust-macro" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b1b06eae85feaecdf9f2854f7cac124e00d5a6e5014bfb02eb1ecdeb5f265b9" +checksum = "53d734e18bdf439ed86afe9d85fc5bfa38db4b676fc0e0a0dae95bd8f14de039" dependencies = [ "anyhow", "proc-macro2", @@ -8517,9 +8515,9 @@ dependencies = [ [[package]] name = "wit-component" -version = "0.202.0" +version = "0.208.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c836b1fd9932de0431c1758d8be08212071b6bba0151f7bac826dbc4312a2a9" +checksum = "ad0397074e61e235635133f1301d1808545e4cb2701d117dc2aca128e65168ae" dependencies = [ "anyhow", "bitflags 2.5.0", @@ -8528,10 +8526,10 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder 0.202.0", + "wasm-encoder 0.208.0", "wasm-metadata", - "wasmparser 0.202.0", - "wit-parser", + "wasmparser 0.208.0", + "wit-parser 0.208.0", ] [[package]] @@ -8552,6 +8550,24 @@ dependencies = [ "wasmparser 0.202.0", ] +[[package]] +name = "wit-parser" +version = "0.208.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27e6bf94e83a0633ae1790912fbe3a97c2fd1ea7956fc58be18aa03517b1b887" +dependencies = [ + "anyhow", + "id-arena", + "indexmap 2.2.6", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser 0.208.0", +] + [[package]] name = "wyz" version = "0.5.1" diff --git a/crates/kitsune-wasm-mrf/example-mrf/Cargo.toml b/crates/kitsune-wasm-mrf/example-mrf/Cargo.toml index 7bbad746b..e3c3a6e37 100644 --- a/crates/kitsune-wasm-mrf/example-mrf/Cargo.toml +++ b/crates/kitsune-wasm-mrf/example-mrf/Cargo.toml @@ -11,7 +11,7 @@ crate-type = ["cdylib"] [dependencies] rand = "0.8.5" -wit-bindgen = "0.24.0" +wit-bindgen = "0.25.0" [lints] workspace = true diff --git a/lib/athena/src/redis/mod.rs b/lib/athena/src/redis/mod.rs index 475ea4b6d..2422d1cc5 100644 --- a/lib/athena/src/redis/mod.rs +++ b/lib/athena/src/redis/mod.rs @@ -9,7 +9,7 @@ use either::Either; use fred::{ clients::RedisPool, interfaces::{SortedSetsInterface, StreamsInterface}, - types::{FromRedis, RedisValue, XID}, + types::{FromRedis, RedisValue, XReadResponse, XReadValue, XID}, }; use iso8601_timestamp::Timestamp; use just_retry::{ @@ -18,7 +18,7 @@ use just_retry::{ }; use smol_str::SmolStr; use speedy_uuid::Uuid; -use std::{collections::HashMap, mem, ops::ControlFlow, str::FromStr, time::SystemTime}; +use std::{mem, ops::ControlFlow, str::FromStr, time::SystemTime}; use tokio::sync::OnceCell; use triomphe::Arc; use typed_builder::TypedBuilder; @@ -103,7 +103,7 @@ where client .xadd( self.queue_name.as_str(), - true, + false, None, XID::Auto, vec![ @@ -151,7 +151,7 @@ where async fn fetch_job_data(&self, max_jobs: usize) -> Result> { self.initialise_group().await?; - let (_start, claimed_ids): (_, Vec<(String, HashMap)>) = self + let (_start, claimed_ids): (_, Vec>) = self .redis_pool .xautoclaim_values( self.queue_name.as_str(), @@ -168,18 +168,18 @@ where Either::Left(claimed_ids.into_iter()) } else { let block_time = if claimed_ids.is_empty() { - None + 0 } else { - Some(BLOCK_TIME.as_millis() as u64) + BLOCK_TIME.as_millis() }; - let read_reply: HashMap)>> = self + let read_reply: XReadResponse = self .redis_pool .xreadgroup_map( self.consumer_group.as_str(), self.consumer_name.as_str(), Some((max_jobs - claimed_ids.len()) as u64), - block_time, + Some(block_time as u64), false, self.queue_name.as_str(), XID::NewInGroup,