From c7e5c907d5c3fd40a939792e51ca41fdf547d8e0 Mon Sep 17 00:00:00 2001
From: Zixuan Chen <remch183@outlook.com>
Date: Tue, 13 Dec 2022 23:01:17 +0800
Subject: [PATCH] fix: list

---
 crates/loro-core/src/container/encoding.rs | 32 +++++++++++++++++-----
 crates/loro-core/tests/test.rs             |  4 +--
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/crates/loro-core/src/container/encoding.rs b/crates/loro-core/src/container/encoding.rs
index d611375b..96d66e7a 100644
--- a/crates/loro-core/src/container/encoding.rs
+++ b/crates/loro-core/src/container/encoding.rs
@@ -50,10 +50,25 @@ impl ContainerExport for ListContainer {
     }
 
     fn export_ranges(&self) -> Self::Range {
-        self.state
+        let ans = self
+            .state
             .iter()
-            .map(|slice_range| (slice_range.get_sliced().0.start))
-            .collect()
+            .fold(Vec::with_capacity(self.state.len() * 2), |mut acc, p| {
+                let s = p.get_sliced().0.start;
+                let e = p.get_sliced().0.end;
+                // print!("{}-{} ", s, e);
+                acc.extend([s, e]);
+                acc
+            });
+        // println!("\n");
+        ans
+        // .map(|slice_range| {
+        //     merge_2_u32_u64(
+        //         slice_range.get_sliced().0.start,
+        //         slice_range.get_sliced().0.end,
+        //     )
+        // })
+        // .collect()
     }
 
     fn import_pool(&mut self, pool: Self::Pool) {
@@ -61,10 +76,13 @@ impl ContainerExport for ListContainer {
     }
 
     fn import_ranges(&mut self, range: Self::Range) {
-        range
-            .into_iter()
-            .enumerate()
-            .for_each(|(pos, start)| self.state.insert(pos, (start..start + 1).into()))
+        let mut index = 0;
+        for r in range.chunks(2) {
+            let s = r[0];
+            let e = r[1];
+            self.state.insert(index, (s..e).into());
+            index += (e - s) as usize;
+        }
     }
 }
 
diff --git a/crates/loro-core/tests/test.rs b/crates/loro-core/tests/test.rs
index fd63d35a..74127ee6 100644
--- a/crates/loro-core/tests/test.rs
+++ b/crates/loro-core/tests/test.rs
@@ -228,8 +228,8 @@ fn test_encode_state() {
     let start = Instant::now();
     let store2 = LoroCore::decode_snapshot(&buf, Some(1), Default::default());
     println!("decode time: {} ms", start.elapsed().as_millis());
-    println!("store2: {}", store.to_json());
-    println!("store2: {}", store2.to_json());
+    println!("store: {}", store.to_json().to_json_pretty());
+    println!("store2: {}", store2.to_json().to_json_pretty());
     // assert_eq!(store.to_json(), store2.to_json());
     let buf2 = store2.encode_snapshot();
     assert_eq!(buf, buf2);