pijul/sanakirja - Change 26KI6CQSTGLQ4MGPLFQYPLDMH56M6VY6KQB5ONMQXUNV3ZX665TQC

Updating the first_rc_len when moving a cursor (this is not used anywhere at the moment, and not part of the public API, but will be useful later)

Created by pmeunier on July 30, 2021

26KI6CQSTGLQ4MGPLFQYPLDMH56M6VY6KQB5ONMQXUNV3ZX665TQC

Dependencies

In channels

main

Change contents

Insertion in sanakirja-core/src/btree/cursor.rs at line 166 [5.63682]
[3.18947]
[4.7764]
```
        self.first_rc_len = N_CURSORS;
```
Insertion in sanakirja-core/src/btree/cursor.rs at line 211 [5.63682]
[3.19559]
[3.19559]
```
        self.first_rc_len = N_CURSORS;
```

Replacement in sanakirja-core/src/btree/cursor.rs at line 265 [5.63682]

∅:D[3.20077] → [6.15636:15681]

B:BD[7.82] → [6.15636:15681]

B:BD[6.15681] → [3.20078:20162]

∅:D[8.8717] → [9.13357:13408]

∅:D[3.20162] → [9.13357:13408]

B:BD[10.84] → [9.13357:13408]

B:BD[9.13408] → [11.40970:41043]

∅:D[12.2446] → [13.12354:12481]

∅:D[11.41043] → [13.12354:12481]

B:BD[13.12354] → [13.12354:12481]

B:BD[13.12481] → [6.15682:15739]

∅:D[6.15739] → [13.12481:12511]

B:BD[13.12481] → [13.12481:12511]

B:BD[13.12577] → [13.12577:12600]

            if P::is_init(&current.cursor) {
                let left = P::right_child(current.page.as_page(), &current.cursor);
                P::move_next(&mut current.cursor);
                // Visit the left child of the page (if any), i.e. push.
                if left != 0 {
                    let page = txn.load_page(left)?;
                    self.push(PageCursor {
                        cursor: P::cursor_before(&page),
                        page,
                    })

[3.20077]

[13.12600]

            if P::is_empty(&current.cursor) {
                if self.len > 1 {
                    if self.first_rc_len == self.len {
                        self.first_rc_len = N_CURSORS
                    }
                    self.len -= 1
                } else {
                    return Ok(None);

Replacement in sanakirja-core/src/btree/cursor.rs at line 274 [5.63682]

B:BD[13.12618] → [3.20163:20264]

∅:D[8.8846] → [4.8172:8186]

∅:D[3.20264] → [4.8172:8186]

B:BD[4.8172] → [4.8172:8186]

            } else if let Some((k, v, r)) = P::current(txn, current.page.as_page(), &current.cursor)
            {

[13.12618]

[9.13409]

            } else {
                let (cur_entry, r) = if let Some((k, v, r)) = P::current(txn, current.page.as_page(), &current.cursor) {
                    (Some((k, v)), r)
                } else {
                    (None, P::right_child(current.page.as_page(), &current.cursor))
                };

Replacement in sanakirja-core/src/btree/cursor.rs at line 281 [5.63682]
∅:D[12.2522] → [13.12796:12823]
∅:D[9.13460] → [13.12796:12823]
B:BD[13.12796] → [13.12796:12823]
```
                if r > 0 {
```
[9.13460]
[13.12823]
```
                if r != 0 {
```

Replacement in sanakirja-core/src/btree/cursor.rs at line 286 [5.63682]

B:BD[13.13012] → [13.13012:13035]

})

[13.12946]

[7.646]

                    });
                    if self.first_rc_len >= N_CURSORS && txn.rc(r)? >= 2 {
                        self.first_rc_len = self.len
                    }

Replacement in sanakirja-core/src/btree/cursor.rs at line 291 [5.63682]

B:BD[7.664] → [11.41044:41158]

                unsafe {
                    return Ok(Some((core::mem::transmute(k), core::mem::transmute(v))));

[7.664]

[11.41158]

                if let Some((k, v)) = cur_entry {
                    unsafe {
                        return Ok(Some((core::mem::transmute(k), core::mem::transmute(v))));
                    }

Deletion in sanakirja-core/src/btree/cursor.rs at line 296 [5.63682]
∅:D[11.41176] → [3.20265:20332]
B:BD[13.13077] → [3.20265:20332]
∅:D[10.456] → [7.664:685]
∅:D[13.13146] → [7.664:685]
∅:D[3.20332] → [7.664:685]
B:BD[7.664] → [7.664:685]
B:BD[7.685] → [13.13147:13180]
```
            } else if self.len > 1 {
                self.len -= 1
            } else {
                return Ok(None);
```

Replacement in sanakirja-core/src/btree/cursor.rs at line 300 [5.63682]

B:BD[13.13211] → [2.10524:10700]

    /// Move the cursor to the previous entry, and return the current
    /// entry. If the cursor is initially after all the entries, this
    /// moves it back by two steps.

[13.13211]

[11.41255]

    /// Move the cursor to the previous entry, and return the entry
    /// that was current before the move. If the cursor is initially
    /// after all the entries, this moves it back by two steps.

Replacement in sanakirja-core/src/btree/cursor.rs at line 309 [5.63682]

B:BD[4.8421] → [6.15798:15844]

            if P::is_empty(&current.cursor) {

[3.20415]

[3.20472]


            if P::is_init(&current.cursor) {
                if self.len > 1 {
                    if self.first_rc_len == self.len {
                        self.first_rc_len = N_CURSORS
                    }
                    self.len -= 1;
                    let current = unsafe { &mut *self.stack[self.len - 1].as_mut_ptr() };
                    P::move_prev(&mut current.cursor);
                } else {
                    return Ok(None);
                }
            } else {
                let cur_entry = P::current(txn, current.page.as_page(), &current.cursor);

Replacement in sanakirja-core/src/btree/cursor.rs at line 329 [5.63682]

B:BD[13.13815] → [13.13815:13838]

})

[13.13750]

[12.2691]

                    });
                    if self.first_rc_len >= N_CURSORS && txn.rc(left)? >= 2 {
                        self.first_rc_len = self.len
                    }

Deletion in sanakirja-core/src/btree/cursor.rs at line 335 [5.63682]
∅:D[2.10742] → [9.13461:13516]
B:BD[12.2716] → [9.13461:13516]
∅:D[12.2795] → [13.13838:13856]
∅:D[9.13516] → [13.13838:13856]
B:BD[13.13838] → [13.13838:13856]
B:BD[13.13856] → [3.20556:20657]
∅:D[8.9070] → [4.8523:8537]
∅:D[3.20657] → [4.8523:8537]
B:BD[4.8523] → [4.8523:8537]
B:BD[10.668] → [3.20658:20738]
∅:D[12.2876] → [13.14115:14235]
∅:D[8.9162] → [13.14115:14235]
∅:D[3.20738] → [13.14115:14235]
B:BD[13.14115] → [13.14115:14235]
B:BD[13.14235] → [6.15902:15958]
∅:D[6.15958] → [13.14235:14265]
B:BD[13.14235] → [13.14235:14265]
∅:D[13.14330] → [7.1266:1289]
B:BD[7.1266] → [7.1266:1289]
B:BD[7.1289] → [12.2877:2902]
```
                    P::move_prev(&mut current.cursor);
                }
            } else if let Some((k, v, _)) = P::current(txn, current.page.as_page(), &current.cursor)
            {
                let l = P::left_child(current.page.as_page(), &current.cursor);
                if l > 0 {
                    let page = txn.load_page(l)?;
                    self.push(PageCursor {
                        cursor: P::cursor_after(&page),
                        page,
                    })
                } else {
```

Replacement in sanakirja-core/src/btree/cursor.rs at line 337 [5.63682]

B:BD[5.70731] → [11.41381:41495]

                unsafe {
                    return Ok(Some((core::mem::transmute(k), core::mem::transmute(v))));

[5.70731]

[11.41495]

                if let Some((k, v, _)) = cur_entry {
                    unsafe {
                        return Ok(Some((core::mem::transmute(k), core::mem::transmute(v))));
                    }

Deletion in sanakirja-core/src/btree/cursor.rs at line 342 [5.63682]

∅:D[11.41513] → [3.20739:20776]

B:BD[4.8579] → [3.20739:20776]

B:BD[10.700] → [3.20777:20894]

∅:D[3.20894] → [9.13573:13624]

B:BD[12.3068] → [9.13573:13624]

∅:D[12.3143] → [13.14441:14495]

∅:D[9.13624] → [13.14441:14495]

B:BD[13.14441] → [13.14441:14495]

            } else if self.len > 1 {
                self.len -= 1;
                let current = unsafe { &mut *self.stack[self.len - 1].as_mut_ptr() };
                P::move_prev(&mut current.cursor);
            } else {
                return Ok(None);