pijul/sanakirja - Change UUUVNC4DWEEL7WV5IRPKPZ6HZMYCPA53XM7LJWICUD4E6GN37IRQC

Debugging/cleanup around cursors

Created by pmeunier on February 4, 2021

UUUVNC4DWEEL7WV5IRPKPZ6HZMYCPA53XM7LJWICUD4E6GN37IRQC

Dependencies

In channels

main

Change contents

Replacement in sanakirja-core/src/lib.rs at line 4 [3.91]
B:BD[3.119] → [4.0:26]
```
pub trait Representable {
```
[3.119]
[3.148]
```
pub trait Representable: core::fmt::Debug {
```
Insertion in sanakirja-core/src/btree/put.rs at line 47 [3.3448]
[3.4780]
[3.4780]
```
    debug!("free = {:?}", free);
```
Deletion in sanakirja-core/src/btree/put.rs at line 81 [3.3448]
B:BD[5.304] → [2.51:81]
```
                cursor.pop();
```
Insertion in sanakirja-core/src/btree/put.rs at line 82 [3.3448]
[2.123]
[6.70]
```
                    cursor.pop();
```
Deletion in sanakirja-core/src/btree/put.rs at line 118 [3.3448]
B:BD[5.470] → [2.191:221]
```
                cursor.pop();
```
Insertion in sanakirja-core/src/btree/put.rs at line 119 [3.3448]
[2.263]
[6.573]
```
                    cursor.pop();
```

Insertion in sanakirja-core/src/btree/put.rs at line 162 [3.3448]

[7.92]

[2.450]

        debug!("pointer {:?} {:?}", cursor.pointer(), cursor.first_rc_level);

Replacement in sanakirja-core/src/btree/page.rs at line 474 [3.8623]

B:BD[8.9543] → [4.4147:4204]

unsafe fn lookup<T, K: Representable, V: Representable>(

[8.9543]

[8.9608]

unsafe fn lookup<T, K: Representable + core::fmt::Debug, V: Representable + core::fmt::Debug>(

Insertion in sanakirja-core/src/btree/page.rs at line 491 [3.8623]
[9.45837]
[9.45837]
```
        debug!("s = {:?}", s);
```
Insertion in sanakirja-core/src/btree/del.rs at line 32 [3.52511]
[3.53628]
[3.53628]
```
        debug!("not found");
```
Deletion in sanakirja-core/src/btree/del.rs at line 75 [3.52511]
B:BD[4.17134] → [2.1290:1308]
```
    cursor.pop();
```
Insertion in sanakirja-core/src/btree/del.rs at line 76 [3.52511]
[2.1341]
[4.17136]
```
        cursor.pop();
```
Deletion in sanakirja-core/src/btree/del.rs at line 97 [3.52511]
B:BD[10.2591] → [2.1342:1363]
```
        cursor.pop()
```
Replacement in sanakirja-core/src/btree/del.rs at line 106 [3.52511]
B:BD[11.10347] → [11.10347:10383]
```
        cursor.first_rc_level <= 1,
```
[11.10347]
[11.10383]
```
        cursor.first_rc_level == 0,
```
Replacement in sanakirja-core/src/btree/del.rs at line 383 [3.52511]
B:BD[2.2361] → [2.2361:2401]
```
        free[cursor.pointer()] = freed;
```
[2.2361]
[3.62825]
```
        free[cursor.pointer() + 1] = freed;
```
Insertion in sanakirja-core/src/btree/del.rs at line 510 [3.52511]
[12.38716]
[12.38716]
```
            debug!("ok freed {:?}", freed);
```
Insertion in sanakirja-core/src/btree/del.rs at line 521 [3.52511]
[12.38925]
[12.38925]
```
            debug!("split freed {:?}", freed);
```
Insertion in sanakirja-core/src/btree/cursor.rs at line 4 [3.63682]
[3.63754]
[3.63766]
```
use log::*;
```
Replacement in sanakirja-core/src/btree/cursor.rs at line 71 [3.63682]
B:BD[3.65424] → [3.65424:65473]
```
        stack[1] = MaybeUninit::new(PageCursor {
```
[3.65424]
[3.65473]
```
        stack[0] = MaybeUninit::new(PageCursor {
```
Deletion in sanakirja-core/src/btree/cursor.rs at line 75 [3.63682]
B:BD[2.3339] → [2.3339:3423]
∅:D[2.3423] → [3.65498:65536]
B:BD[3.65498] → [3.65498:65536]
```
        stack[0] = MaybeUninit::new(PageCursor {
            page: CowPage::null(),
            cursor: None,
        });
```
Replacement in sanakirja-core/src/btree/cursor.rs at line 78 [3.63682]
B:BD[3.65611] → [3.65611:65635]
```
            pointer: 1,
```
[3.65611]
[3.65635]
```
            pointer: 0,
```
Insertion in sanakirja-core/src/btree/cursor.rs at line 102 [3.63682]
[2.3788]
[2.3788]
```
        assert!(self.pointer > 0);
```
Replacement in sanakirja-core/src/btree/cursor.rs at line 117 [3.63682]
B:BD[3.66162] → [3.66162:66202]
```
        let mut last_matching_page = 0;
```
[3.66162]
[3.66202]
```
        let mut last_matching_page = N_CURSORS;
```
Insertion in sanakirja-core/src/btree/cursor.rs at line 120 [3.63682]
[6.2548]
[6.2548]
```
            debug!("set cursor {:?}", self.pointer);
```
Insertion in sanakirja-core/src/btree/cursor.rs at line 130 [3.63682]
[3.66693]
[3.66693]
```
            debug!("{:?}", cursor);
```

Insertion in sanakirja-core/src/btree/cursor.rs at line 138 [3.63682]

[3.67027]

                } else {
                    debug!("not found on page {:?}", page)

Replacement in sanakirja-core/src/btree/cursor.rs at line 144 [3.63682]

B:BD[3.67194] → [3.67194:67229]

B:BD[8.34500] → [8.34500:34573]

                self.pointer += 1;
                self.stack[self.pointer] = MaybeUninit::new(PageCursor {

[3.67194]

[8.34573]

                self.push(PageCursor {

Replacement in sanakirja-core/src/btree/cursor.rs at line 152 [3.63682]
B:BD[3.67477] → [3.67477:67513]
```
        if last_matching_page > 0 {
```
[3.67477]
[3.67513]
```
        if last_matching_page < N_CURSORS {
```

Replacement in sanakirja-core/src/btree/cursor.rs at line 190 [3.63682]

B:BD[3.68805] → [3.68805:68806]

[3.68805]

[11.11341]

}
impl<K: Representable + ?Sized + core::fmt::Debug, V: Representable + ?Sized + core::fmt::Debug, P: BTreePage<K, V>> Cursor<K, V, P> {

Insertion in sanakirja-core/src/btree/cursor.rs at line 193 [3.63682]
[11.11441]
[3.68933]
```
        debug!("=== next");
```
Insertion in sanakirja-core/src/btree/cursor.rs at line 195 [3.63682]
[3.68948]
[13.0]
```
            debug!("next: {:?}", self.pointer);
```

Replacement in sanakirja-core/src/btree/cursor.rs at line 203 [3.63682]

∅:D[13.395] → [3.70442:70566]

B:BD[3.70442] → [3.70442:70566]

                        self.pointer += 1;
                        self.stack[self.pointer] = MaybeUninit::new(PageCursor {

[13.395]

[13.396]

                        self.push(PageCursor {

Replacement in sanakirja-core/src/btree/cursor.rs at line 209 [3.63682]

∅:D[11.11491] → [13.501:584]

B:BD[13.501] → [13.501:584]

                } else if self.pointer > 1 {
                    self.pointer -= 1

[11.11491]

[13.584]

                } else if self.pointer > 0 {
                    self.pop();

Replacement in sanakirja-core/src/btree/cursor.rs at line 221 [3.63682]

B:BD[13.1060] → [13.1060:1176]

                    self.pointer += 1;
                    self.stack[self.pointer] = MaybeUninit::new(PageCursor {

[13.1060]

[13.1176]

                    self.push(PageCursor {

Deletion in sanakirja/src/tests.rs at line 31 [14.11]
B:BD[14.1330] → [14.1330:1374]
```
    let now = std::time::SystemTime::now();
```
Insertion in sanakirja/src/tests.rs at line 43 [14.11]
[14.1952]
[14.1952]
```
    crate::debug::debug(&txn, &[&db], "debug0", true);
```
Deletion in sanakirja/src/tests.rs at line 76 [14.11]
B:BD[14.3089] → [14.3089:3131]
```
    println!("moi: {:?}", now.elapsed());
```
Insertion in sanakirja/src/tests.rs at line 162 [14.11]
[14.6386]
[14.6386]
```
    debug!(">>>>>>");
```
Insertion in sanakirja/src/tests.rs at line 168 [14.11]
[14.6508]
[14.6508]
```
    debug!("<<<<<<<<<");
```
Replacement in sanakirja/src/environment/muttxn.rs at line 272 [3.80166]
∅:D[15.1707] → [7.587:624]
B:BD[3.88500] → [7.587:624]
```
        debug!("decr_rc {:?}", off);
```
[15.1707]
[3.88500]
```
        debug!("decr_rc {:?} {:?}", off, self.rc);
```

Replacement in sanakirja/src/environment/muttxn.rs at line 295 [3.80166]

B:BD[7.934] → [15.1708:1752]

                return Ok(rc as usize - 1);

[7.934]

[16.1935]

                return Ok((rc & 0xfff) as usize - 1);

Replacement in sanakirja/src/environment/muttxn.rs at line 305 [3.80166]
∅:D[15.1836] → [16.1993:2036]
B:BD[3.89253] → [16.1993:2036]
```
        debug!("decr_rc_owned {:?}", off);
```
[15.1836]
[3.89281]
```
        debug!("decr_rc_owned {:?} {:?}", off, self.rc);
```
Insertion in sanakirja/src/environment/muttxn.rs at line 320 [3.80166]
[16.2098]
[8.39211]
```
                debug!("del");
```
Insertion in sanakirja/src/environment/muttxn.rs at line 322 [3.80166]
[8.39267]
[7.935]
```
                debug!("/del");
```

Replacement in sanakirja/src/environment/muttxn.rs at line 330 [3.80166]

B:BD[7.1198] → [15.1837:1881]

                return Ok(rc as usize - 1);

[7.1198]

[16.2244]

                return Ok((rc & 0xfff) as usize - 1);

Debugging/cleanup around cursors

Dependencies

In channels

Change contents

Replacement in sanakirja-core/src/lib.rs at line 4 [3.91]

Insertion in sanakirja-core/src/btree/put.rs at line 47 [3.3448]

Deletion in sanakirja-core/src/btree/put.rs at line 81 [3.3448]

Insertion in sanakirja-core/src/btree/put.rs at line 82 [3.3448]

Deletion in sanakirja-core/src/btree/put.rs at line 118 [3.3448]

Insertion in sanakirja-core/src/btree/put.rs at line 119 [3.3448]

Insertion in sanakirja-core/src/btree/put.rs at line 162 [3.3448]

Replacement in sanakirja-core/src/btree/page.rs at line 474 [3.8623]

Insertion in sanakirja-core/src/btree/page.rs at line 491 [3.8623]

Insertion in sanakirja-core/src/btree/del.rs at line 32 [3.52511]

Deletion in sanakirja-core/src/btree/del.rs at line 75 [3.52511]

Insertion in sanakirja-core/src/btree/del.rs at line 76 [3.52511]

Deletion in sanakirja-core/src/btree/del.rs at line 97 [3.52511]

Replacement in sanakirja-core/src/btree/del.rs at line 106 [3.52511]

Replacement in sanakirja-core/src/btree/del.rs at line 383 [3.52511]

Insertion in sanakirja-core/src/btree/del.rs at line 510 [3.52511]

Insertion in sanakirja-core/src/btree/del.rs at line 521 [3.52511]

Insertion in sanakirja-core/src/btree/cursor.rs at line 4 [3.63682]

Replacement in sanakirja-core/src/btree/cursor.rs at line 71 [3.63682]

Deletion in sanakirja-core/src/btree/cursor.rs at line 75 [3.63682]

Replacement in sanakirja-core/src/btree/cursor.rs at line 78 [3.63682]

Insertion in sanakirja-core/src/btree/cursor.rs at line 102 [3.63682]

Replacement in sanakirja-core/src/btree/cursor.rs at line 117 [3.63682]

Insertion in sanakirja-core/src/btree/cursor.rs at line 120 [3.63682]

Insertion in sanakirja-core/src/btree/cursor.rs at line 130 [3.63682]

Insertion in sanakirja-core/src/btree/cursor.rs at line 138 [3.63682]

Replacement in sanakirja-core/src/btree/cursor.rs at line 144 [3.63682]

Replacement in sanakirja-core/src/btree/cursor.rs at line 152 [3.63682]

Replacement in sanakirja-core/src/btree/cursor.rs at line 190 [3.63682]

Insertion in sanakirja-core/src/btree/cursor.rs at line 193 [3.63682]

Insertion in sanakirja-core/src/btree/cursor.rs at line 195 [3.63682]

Replacement in sanakirja-core/src/btree/cursor.rs at line 203 [3.63682]

Replacement in sanakirja-core/src/btree/cursor.rs at line 209 [3.63682]

Replacement in sanakirja-core/src/btree/cursor.rs at line 221 [3.63682]

Deletion in sanakirja/src/tests.rs at line 31 [14.11]

Insertion in sanakirja/src/tests.rs at line 43 [14.11]

Deletion in sanakirja/src/tests.rs at line 76 [14.11]

Insertion in sanakirja/src/tests.rs at line 162 [14.11]

Insertion in sanakirja/src/tests.rs at line 168 [14.11]

Replacement in sanakirja/src/environment/muttxn.rs at line 272 [3.80166]

Replacement in sanakirja/src/environment/muttxn.rs at line 295 [3.80166]

Replacement in sanakirja/src/environment/muttxn.rs at line 305 [3.80166]

Insertion in sanakirja/src/environment/muttxn.rs at line 320 [3.80166]

Insertion in sanakirja/src/environment/muttxn.rs at line 322 [3.80166]

Replacement in sanakirja/src/environment/muttxn.rs at line 330 [3.80166]