fix(codec): wrong pos when split array (#516)

y-crdt · Aug 22, 2023 · 67d7f25 · 67d7f25
1 parent 5e3b34d
commit 67d7f25
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 27 deletions.
diff --git a/y-octo/src/doc/codec/content.rs b/y-octo/src/doc/codec/content.rs
@@ -249,11 +249,11 @@ impl Content {
                 Ok((Self::String(left.to_string()), Self::String(right.to_string())))
             }
             Self::Json(vec) => {
-                let (left, right) = vec.split_at((diff + 1) as usize);
+                let (left, right) = vec.split_at(diff as usize);
                 Ok((Self::Json(left.to_owned()), Self::Json(right.to_owned())))
             }
             Self::Any(vec) => {
-                let (left, right) = vec.split_at((diff + 1) as usize);
+                let (left, right) = vec.split_at(diff as usize);
                 Ok((Self::Any(left.to_owned()), Self::Any(right.to_owned())))
             }
             Self::Deleted(len) => {
@@ -357,18 +357,18 @@ mod tests {
         {
             let (left, right) = contents[1].split(1).unwrap();
             assert!(contents[1].splittable());
-            assert_eq!(left, Content::Json(vec![None, Some("test_1".to_string())]));
-            assert_eq!(right, Content::Json(vec![Some("test_2".to_string())]));
+            assert_eq!(left, Content::Json(vec![None]));
+            assert_eq!(
+                right,
+                Content::Json(vec![Some("test_1".to_string()), Some("test_2".to_string())])
+            );
         }
 
         {
             let (left, right) = contents[2].split(1).unwrap();
             assert!(contents[2].splittable());
-            assert_eq!(
-                left,
-                Content::Any(vec![Any::BigInt64(42), Any::String("Test Any".to_string())])
-            );
-            assert_eq!(right, Content::Any(vec![]));
+            assert_eq!(left, Content::Any(vec![Any::BigInt64(42)]));
+            assert_eq!(right, Content::Any(vec![Any::String("Test Any".to_string())]));
         }
 
         {

diff --git a/y-octo/src/doc/store.rs b/y-octo/src/doc/store.rs
@@ -596,32 +596,32 @@ impl DocStore {
                     // need to split the item and delete the right part
                     // -----item-----
                     //    ^start
-                    let struct_info = &items[idx];
-                    let id = struct_info.id();
+                    let node = &items[idx];
+                    let id = node.id();
 
-                    if !struct_info.deleted() && id.clock < start {
+                    if !node.deleted() && id.clock < start {
                         DocStore::split_node_at(items, idx, start - id.clock)?;
                         idx += 1;
                     }
                 };
 
                 while idx < items.len() {
-                    let struct_info = items[idx].clone();
-                    let id = struct_info.id();
-
-                    if let Some(item) = struct_info.as_item().get() {
-                        if !item.deleted() && id.clock < end {
-                            // need to split the item
-                            // -----item-----
-                            //           ^end
-                            if end < id.clock + struct_info.len() {
-                                DocStore::split_node_at(items, idx, end - id.clock)?;
-                            }
+                    let node = items[idx].clone();
+                    let id = node.id();
+
+                    if id.clock < end {
+                        if !node.deleted() {
+                            if let Some(item) = node.as_item().get() {
+                                // need to split the item
+                                // -----item-----
+                                //           ^end
+                                if end < id.clock + node.len() {
+                                    DocStore::split_node_at(items, idx, end - id.clock)?;
+                                }
 
-                            self.delete_set.add(client, id.clock, item.len());
-                            Self::delete_item(item, None);
-                        } else {
-                            break;
+                                self.delete_set.add(client, id.clock, item.len());
+                                Self::delete_item(item, None);
+                            }
                         }
                     } else {
                         break;