pijul/sanakirja - Change 7WJNSPEWJSJROOYHU6QROWPUZ6WNIOUG2BPSOPDPCK6RG2NQU6OQC

Using the same definition of the "occupied" field uniform everywhere

Created by pmeunier on February 5, 2021

7WJNSPEWJSJROOYHU6QROWPUZ6WNIOUG2BPSOPDPCK6RG2NQU6OQC

Dependencies

In channels

main

Change contents

Replacement in sanakirja-core/src/btree/page_unsized.rs at line 56 [3.2014]

B:BD[3.3112] → [3.3112:3170]

            occupied += crate::alloc_size(k, v) as usize;

[3.3112]

[3.3170]

            occupied += 8 + crate::alloc_size(k, v) as usize;

Replacement in sanakirja-core/src/btree/page_unsized.rs at line 58 [3.2014]

B:BD[3.3213] → [3.3213:3275]

                occupied += crate::alloc_size(k, v) as usize;

[3.3213]

[3.3275]

                occupied += 8 + crate::alloc_size(k, v) as usize;

Deletion in sanakirja-core/src/btree/page_unsized.rs at line 60 [3.2014]

B:BD[3.3289] → [4.244:278]

∅:D[4.278] → [3.3511:3607]

B:BD[3.3511] → [3.3511:3607]

            if m.ins2.is_some() {
                occupied += 16
            } else {
                occupied += 8
            }

Deletion in sanakirja-core/src/btree/page_unsized/rebalance.rs at line 51 [3.22926]
B:BD[3.24242] → [2.441:520]
```
    let hdrl = header(new_left.0.as_page());
    debug!("mid = {:?}", m.mid);
```
Replacement in sanakirja-core/src/btree/page.rs at line 58 [7.8623]
∅:D[5.1407] → [6.1548:1577]
B:BD[7.10157] → [6.1548:1577]
```
        let mut occupied = {
```
[5.1407]
[6.1577]
```
        let mut total = {
```

Replacement in sanakirja-core/src/btree/page.rs at line 64 [7.8623]

B:BD[7.10400] → [7.10400:10452]

            occupied += (HDR + al - 1) & (!al - 1);

[7.10400]

[7.10452]

            total += (HDR + al - 1) & (!al - 1);

Replacement in sanakirja-core/src/btree/page.rs at line 66 [7.8623]
B:BD[7.10469] → [7.10469:10497]
```
            occupied += HDR
```
[7.10469]
[7.10497]
```
            total += HDR
```

Deletion in sanakirja-core/src/btree/page.rs at line 68 [7.8623]

B:BD[7.10508] → [6.1626:1740]

        if m.skip_first {
            occupied -= Self::current_size(m.page.as_page(), &m.c1) as usize;
        }

Replacement in sanakirja-core/src/btree/page.rs at line 69 [7.8623]

∅:D[8.117] → [6.1741:1799]

B:BD[7.10614] → [6.1741:1799]

            occupied += crate::alloc_size(k, v) as usize;

[8.117]

[9.492]

            let extra = if m.c1.is_leaf { 8 } else { 0 };
            total += extra + crate::alloc_size(k, v) as usize;

Replacement in sanakirja-core/src/btree/page.rs at line 72 [7.8623]

B:BD[9.535] → [9.535:611]

B:BD[9.611] → [3.44444:44475]

B:BD[3.44475] → [4.1227:1351]

∅:D[4.1351] → [3.44475:44607]

B:BD[3.44475] → [3.44475:44607]

∅:D[9.783] → [7.10806:10824]

∅:D[3.44607] → [7.10806:10824]

B:BD[7.10806] → [7.10806:10824]

                occupied += crate::alloc_size(k, v) as usize;
            }
            if !m.c1.is_leaf {
                // If m is an internal node, there is an extra cost,
                // which doesn't exist if m is a leaf.
                if m.ins2.is_some() {
                    occupied += 16
                } else {
                    occupied += 8
                }

[9.535]

[7.10875]

                total += extra + crate::alloc_size(k, v) as usize;

Replacement in sanakirja-core/src/btree/page.rs at line 75 [7.8623]

B:BD[7.10899] → [7.10899:10916]

        occupied

[7.10899]

[7.10916]

        if m.skip_first {
            total -= Self::current_size(m.page.as_page(), &m.c1) as usize;
        }
        total

Replacement in sanakirja-core/src/btree/page.rs at line 257 [7.8623]

B:BD[9.3405] → [9.3405:3485]

        if mod_size >= PAGE_SIZE / 2 || occupied - first_size < PAGE_SIZE / 2 {

[9.3405]

[9.3485]

        if mod_size >= PAGE_SIZE / 2 || hdr_size + occupied - first_size < PAGE_SIZE / 2 {

Deletion in sanakirja-core/src/btree/page/rebalance.rs at line 50 [10.387]
B:BD[10.1736] → [10.1736:1795]
```
    let mut n = header(new_left.0.as_page()).n() as isize;
```