This is an automated email from the ASF dual-hosted git repository. gkoszyk pushed a commit to branch rebase_master in repository https://gitbox.apache.org/repos/asf/iggy.git
commit 7f13ce06271a269b0e5bbf2afeb46d43d9a4b1a7 Author: numinex <[email protected]> AuthorDate: Fri Jun 27 14:01:13 2025 +0200 broken iggyrwlock import --- Cargo.lock | 47 ++++++++++++---------- .../server/src/streaming/topics/consumer_groups.rs | 6 +-- core/server/src/streaming/topics/storage.rs | 2 +- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 19be4ecb..f06db7bf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1177,9 +1177,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.18.1" +version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "byte-unit" @@ -1479,9 +1479,12 @@ dependencies = [ [[package]] name = "cobs" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" +checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1" +dependencies = [ + "thiserror 2.0.12", +] [[package]] name = "colorchoice" @@ -1813,9 +1816,9 @@ dependencies = [ [[package]] name = "crunchy" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" +checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "crypto-common" @@ -3275,7 +3278,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.9.0", + "indexmap 2.10.0", "slab", "tokio", "tokio-util", @@ -3294,7 +3297,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.3.1", - "indexmap 2.9.0", + "indexmap 2.10.0", "slab", "tokio", "tokio-util", @@ -4026,7 +4029,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "f8a9aa791c7b5a71b636b7a68207fdebf171ddfc593d9c8506ec4cbc527b6a84" dependencies = [ "implicit-clone-derive", - "indexmap 2.9.0", + "indexmap 2.10.0", ] [[package]] @@ -4052,9 +4055,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" dependencies = [ "equivalent", "hashbrown 0.15.4", @@ -4502,9 +4505,9 @@ dependencies = [ [[package]] name = "libredox" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +checksum = "1580801010e535496706ba011c15f8532df6b42297d2e471fec38ceadd8c0638" dependencies = [ "bitflags 2.9.1", "libc", @@ -5728,9 +5731,9 @@ dependencies = [ [[package]] name = "postcard" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "170a2601f67cc9dba8edd8c4870b15f71a6a2dc196daec8c83f72b59dff628a8" +checksum = "6c1de96e20f51df24ca73cafcc4690e044854d803259db27a00a461cb3b9d17a" dependencies = [ "cobs", "embedded-io 0.4.0", @@ -6940,7 +6943,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.9.0", + "indexmap 2.10.0", "schemars", "serde", "serde_derive", @@ -6967,7 +6970,7 @@ version = "0.0.12" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "59e2dd588bf1597a252c3b920e0143eb99b0f76e4e082f4c92ce34fbc9e71ddd" dependencies = [ - "indexmap 2.9.0", + "indexmap 2.10.0", "itoa", "libyml", "memchr", @@ -7710,7 +7713,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.9.0", + "indexmap 2.10.0", "toml_datetime", "winnow 0.5.40", ] @@ -7721,7 +7724,7 @@ version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index"; checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap 2.9.0", + "indexmap 2.10.0", "serde", "serde_spanned", "toml_datetime", @@ -7832,7 +7835,7 @@ checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", - "indexmap 2.9.0", + "indexmap 2.10.0", "pin-project-lite", "slab", "sync_wrapper", @@ -9029,7 +9032,7 @@ dependencies = [ "futures", "gloo 0.10.0", "implicit-clone", - "indexmap 2.9.0", + "indexmap 2.10.0", "js-sys", "prokio", "rustversion", @@ -9238,7 +9241,7 @@ dependencies = [ "flate2", "getrandom 0.3.3", "hmac", - "indexmap 2.9.0", + "indexmap 2.10.0", "liblzma", "memchr", "pbkdf2", diff --git a/core/server/src/streaming/topics/consumer_groups.rs b/core/server/src/streaming/topics/consumer_groups.rs index a2efba95..bf249d2e 100644 --- a/core/server/src/streaming/topics/consumer_groups.rs +++ b/core/server/src/streaming/topics/consumer_groups.rs @@ -321,10 +321,8 @@ mod tests { let result = topic.create_consumer_group(Some(group_id), name); assert!(result.is_ok()); { - let created_consumer_group = result.unwrap(); - assert_eq!(created_consumer_group.group_id, group_id); - assert_eq!(created_consumer_group.name, name); - assert_eq!(created_consumer_group.topic_id, topic_id); + let created_consumer_group_id = result.unwrap(); + assert_eq!(created_consumer_group_id.get_u32_value().unwrap(), group_id); } assert_eq!(topic.consumer_groups.borrow().len(), 1); diff --git a/core/server/src/streaming/topics/storage.rs b/core/server/src/streaming/topics/storage.rs index ae9435e5..bfb7ead0 100644 --- a/core/server/src/streaming/topics/storage.rs +++ b/core/server/src/streaming/topics/storage.rs @@ -34,7 +34,7 @@ use std::path::Path; use std::sync::Arc; use tokio::fs; use tokio::fs::create_dir_all; -use tokio::sync::{Mutex, RwLock}; +use tokio::sync::{Mutex}; use tracing::{error, info, warn}; #[derive(Debug)]
