From 4dd609ca510d69d1dd5847885fedb947c65ef1b8 Mon Sep 17 00:00:00 2001
From: Zixuan Chen <remch183@outlook.com>
Date: Thu, 13 Jun 2024 14:48:10 +0800
Subject: [PATCH] fix: cids encode/decode

---
 .../loro-internal/src/oplog/change_store.rs   |  1 -
 .../src/state/container_store.rs              | 70 +++++++++++++++----
 2 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/crates/loro-internal/src/oplog/change_store.rs b/crates/loro-internal/src/oplog/change_store.rs
index e283bcde..93388248 100644
--- a/crates/loro-internal/src/oplog/change_store.rs
+++ b/crates/loro-internal/src/oplog/change_store.rs
@@ -432,7 +432,6 @@ impl ChangesBlock {
 
     fn get_change_index_by_lamport(&self, lamport: Lamport) -> Option<usize> {
         let changes = self.content.try_changes().unwrap();
-        dbg!(&changes, lamport);
         let r = changes.binary_search_by(|c| {
             if c.lamport > lamport {
                 Ordering::Greater
diff --git a/crates/loro-internal/src/state/container_store.rs b/crates/loro-internal/src/state/container_store.rs
index 9fcc8f3d..3241e708 100644
--- a/crates/loro-internal/src/state/container_store.rs
+++ b/crates/loro-internal/src/state/container_store.rs
@@ -137,7 +137,9 @@ impl ContainerWrapper {
 }
 
 mod encode {
-    use loro_common::{ContainerID, ContainerType, Counter, InternalString, LoroError, LoroResult};
+    use loro_common::{
+        ContainerID, ContainerType, Counter, InternalString, LoroError, LoroResult, PeerID,
+    };
     use serde::{Deserialize, Serialize};
     use serde_columnar::{
         izip, AnyRleDecoder, AnyRleEncoder, BoolRleDecoder, BoolRleEncoder, DeltaRleDecoder,
@@ -264,22 +266,10 @@ mod encode {
             }
         }
 
-        let mut peers = Vec::with_capacity(peers_bytes.len() / 8);
-        {
-            // decode peer_ids
-            let mut bytes: &[u8] = &peers_bytes;
-            for _ in 0..peers_bytes.len() / 8 {
-                let mut buf = [0; 8];
-                buf.copy_from_slice(&bytes[..8]);
-                peers.push(u64::from_le_bytes(buf));
-                bytes = &bytes[8..];
-            }
-        }
-
         let mut counters: DeltaRleDecoder<i32> = DeltaRleDecoder::new(&counters);
         let mut offsets: DeltaRleDecoder<usize> = DeltaRleDecoder::new(&offsets);
+        let mut peer_iter: AnyRleDecoder<u64> = AnyRleDecoder::new(&peers_bytes);
         let mut s_iter = strings.into_iter();
-        let mut peer_iter = peers.into_iter();
 
         for (t, is_root) in types.zip(is_root_iter) {
             let ty = ContainerType::try_from_u8(t.unwrap()).unwrap();
@@ -297,7 +287,7 @@ mod encode {
                 }
                 false => ans.push((
                     ContainerID::Normal {
-                        peer: peer_iter.next().unwrap(),
+                        peer: peer_iter.next().unwrap().unwrap(),
                         counter: counters.next().unwrap().unwrap() as Counter,
                         container_type: ty,
                     },
@@ -308,4 +298,54 @@ mod encode {
 
         Ok(ans)
     }
+
+    #[cfg(test)]
+    mod test {
+        use super::*;
+
+        #[test]
+        fn test_container_store() {
+            let mut encoder = CidOffsetEncoder::new();
+            let input = [
+                (
+                    ContainerID::Root {
+                        name: "map".into(),
+                        container_type: ContainerType::Map,
+                    },
+                    0,
+                ),
+                (
+                    ContainerID::Root {
+                        name: "list".into(),
+                        container_type: ContainerType::List,
+                    },
+                    1,
+                ),
+                (
+                    ContainerID::Normal {
+                        peer: 1,
+                        counter: 0,
+                        container_type: ContainerType::Map,
+                    },
+                    2,
+                ),
+                (
+                    ContainerID::Normal {
+                        peer: 2,
+                        counter: 1,
+                        container_type: ContainerType::List,
+                    },
+                    4,
+                ),
+            ];
+            for (cid, offset) in input.iter() {
+                encoder.push(cid, *offset);
+            }
+            let mut bytes = Vec::new();
+            encoder.to_io(&mut bytes);
+
+            let cids = decode_cids(&bytes).unwrap();
+            assert_eq!(&cids, &input)
+        }
+    }
 }