fix: ensure ordering while handling map from resp3

Signed-off-by: Anthony Griffon <[email protected]>

Author: Miaxos

Cargo.lock

@@ -35,6 +35,7 @@ derive_builder.workspace = true
 dotenv.workspace = true
 futures = "0.3"
 futures-locks = "0.7"
+indexmap = "2"
 local-sync = "0.1"
 monoio = { workspace = true, features = ["bytes", "sync", "iouring"] }
 rustc-hash = "1.1.0"

app/roster/Cargo.toml

@@ -1,14 +1,14 @@
 //! Provides a type representing a Redis protocol frame as well as utilities for
 //! parsing frames from a byte array.
 
-use std::collections::HashMap;
 use std::convert::TryInto;
 use std::io::Cursor;
 use std::num::TryFromIntError;
 use std::string::FromUtf8Error;
 
 use bytes::{Buf, Bytes, BytesMut};
 use bytestring::ByteString;
+use indexmap::IndexMap;
 
 pub(crate) mod write;
 
@@ -21,7 +21,7 @@ pub enum Frame {
     Bulk(Bytes),
     Null,
     Array(Vec<Frame>),
-    Map(HashMap<Frame, Frame>),
+    Map(IndexMap<Frame, Frame>),
 }
 
 // TODO(@miaxos): hacky hash derivation for now, to test a little.
@@ -182,7 +182,7 @@ impl Frame {
             }
             b'%' => {
                 let len = get_decimal(src)?.try_into()?;
-                let mut out = HashMap::with_capacity(len);
+                let mut out = IndexMap::with_capacity(len);
 
                 for _ in (0..(len * 2)).step_by(2) {
                     let key = Frame::parse(src)?;

app/roster/src/application/server/frame/mod.rs

@@ -97,10 +97,10 @@ pub async fn write_frame(
 
 #[cfg(test)]
 mod tests {
-    use std::collections::HashMap;
     use std::io::Write;
 
     use bytestring::ByteString;
+    use indexmap::IndexMap;
     use monoio::buf::{IoBuf, IoVecBuf};
     use monoio::io::AsyncWriteRent;
     use monoio::BufResult;
@@ -176,9 +176,7 @@ mod tests {
     #[monoio::test]
     async fn simple_decimal_write_value_hashmap() {
         let mut v = TestUtilVec(Vec::new());
-        // HashMap are unordered when accessing them, so it could be first first
-        // or first in second.
-        let frame = Frame::Map(HashMap::from_iter([
+        let frame = Frame::Map(IndexMap::from_iter([
             (
                 Frame::Simple(ByteString::from_static("first")),
                 Frame::Integer(1),
@@ -189,11 +187,6 @@ mod tests {
             ),
         ]));
         write_frame(&mut v, &frame).await.unwrap();
-        let possible_1 =
-            String::from_utf8_lossy(b"%2\r\n+first\r\n:1\r\n+second\r\n:2\r\n");
-        let possible_2 =
-            String::from_utf8_lossy(b"%2\r\n+second\r\n:2\r\n+first\r\n:1\r\n");
-        let result = String::from_utf8(v.0).unwrap();
-        assert!(result == possible_1 || result == possible_2);
+        insta::assert_debug_snapshot!(String::from_utf8(v.0).unwrap(), @r###""%2\r\n+first\r\n:1\r\n+second\r\n:2\r\n""###);
     }
 }