pijul/sanakirja - Change APPY2E7M5NHNC6MFYXSVEKJVAILK7YAZVTVE3W75EK2JNFVS3XBQC

Unsized deletions + custom sizes back

Created by pmeunier on February 3, 2021

APPY2E7M5NHNC6MFYXSVEKJVAILK7YAZVTVE3W75EK2JNFVS3XBQC

Dependencies

In channels

main

Change contents

Insertion in sanakirja-core/src/btree/page_unsized.rs at line 37 [3.2014]

[3.2747]

    type Saved = (*const K, *const V);
    fn save_deleted_leaf_entry(k: &K, v: &V) -> Self::Saved {
        (k as *const K, v as *const V)
    }
    unsafe fn from_saved<'a>(s: &Self::Saved) -> (&'a K, &'a V) {
        (&*s.0, &*s.1)
    }

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

B:BD[3.3289] → [3.3289:3511]

            if m.c1.is_leaf {
                if m.ins2.is_some() {
                    occupied += 4;
                } else {
                    occupied += 2;
                }
            } else if m.ins2.is_some() {

[3.3289]

[3.3511]

            if m.ins2.is_some() {

Insertion in sanakirja-core/src/btree/page.rs at line 22 [4.8623]

[4.8683]

fn tuple_size<K: Representable, V: Representable>() -> usize {
    let s = ((K::SIZE.unwrap() + V::ALIGN - 1) & !(V::ALIGN - 1)) + V::SIZE.unwrap();
    let al = K::ALIGN.max(V::ALIGN);
    (s + al - 1) & !(al - 1)
}

Replacement in sanakirja-core/src/btree/page.rs at line 29 [4.8623]

B:BD[4.8700] → [4.8700:8769]

pub struct Page<K, V> {
    kv: core::marker::PhantomData<(K, V)>,
}

[4.8700]

[4.8769]

pub struct Page<K, V>(super::page_unsized::Page<K, V>);

Replacement in sanakirja-core/src/btree/page.rs at line 35 [4.8623]

B:BD[5.1301] → [5.1301:1421]

        debug!("init {:?}", page);
        let h = header_mut(page);
        h.init();
        debug!("init: {:?}", h);

[5.1301]

[4.9926]

        <super::page_unsized::Page<K, V>>::init(page)

Replacement in sanakirja-core/src/btree/page.rs at line 39 [4.8623]

B:BD[5.1457] → [5.1457:1493]

B:BD[5.1493] → [6.96:117]

        let hdr = header_mut(page);
        hdr.clean();

[5.1457]

[4.10094]

        <super::page_unsized::Page<K, V>>::clean(page)
    }
    type Saved = (K, V);
    fn save_deleted_leaf_entry(k: &K, v: &V) -> Self::Saved {
        unsafe {
            let mut k0 = core::mem::MaybeUninit::uninit();
            let mut v0 = core::mem::MaybeUninit::uninit();
            core::ptr::copy_nonoverlapping(k, k0.as_mut_ptr(), 1);
            core::ptr::copy_nonoverlapping(v, v0.as_mut_ptr(), 1);
            (k0.assume_init(), v0.assume_init())
        }

Insertion in sanakirja-core/src/btree/page.rs at line 53 [4.8623]

[4.10101]

[7.1354]

    unsafe fn from_saved<'a>(s: &Self::Saved) -> (&'a K, &'a V) {
        (core::mem::transmute(&s.0), core::mem::transmute(&s.1))
    }

Insertion in sanakirja-core/src/btree/page.rs at line 77 [4.8623]

[3.44475]

                // If m is an internal node, there is an extra cost,
                // which doesn't exist if m is a leaf.

Replacement in sanakirja-core/src/btree/page.rs at line 151 [4.8623]

∅:D[7.1768] → [5.2535:2644]

B:BD[5.2535] → [5.2535:2644]

            let b = if Self::is_dirty(page.as_page()) { 1 } else { 0 };
            freed = page.offset | b;

[7.1768]

[5.2644]

            freed = page.offset | if Self::is_dirty(page.as_page()) { 1 } else { 0 };

Replacement in sanakirja-core/src/btree/page.rs at line 175 [4.8623]

B:BD[8.1693] → [2.5312:5373]

                let f = core::mem::size_of::<Tuple<K, V>>();

[8.1693]

                let f = tuple_size::<K, V>();

Replacement in sanakirja-core/src/btree/page.rs at line 230 [4.8623]

B:BD[4.15906] → [3.45001:45058]

            let f = core::mem::size_of::<Tuple<K, V>>();

[4.15906]

[3.45058]

            let f = tuple_size::<K, V>();

Replacement in sanakirja-core/src/btree/page.rs at line 345 [4.8623]

B:BD[4.19528] → [3.45169:45226]

            let f = core::mem::size_of::<Tuple<K, V>>();

[4.19528]

[3.45226]

            let f = tuple_size::<K, V>();

Replacement in sanakirja-core/src/btree/page.rs at line 369 [4.8623]

B:BD[5.7817] → [3.45251:45308]

            let f = core::mem::size_of::<Tuple<K, V>>();

[5.7817]

[3.45308]

            let f = tuple_size::<K, V>();

Replacement in sanakirja-core/src/btree/page.rs at line 381 [4.8623]

B:BD[4.20851] → [3.45432:45484]

                core::mem::size_of::<Tuple<K, V>>()

[4.20851]

[4.21215]

                tuple_size::<K, V>()

Replacement in sanakirja-core/src/btree/page.rs at line 436 [4.8623]

B:BD[4.24688] → [3.45485:45554]

                        let f = core::mem::size_of::<Tuple<K, V>>();

[4.24688]

[3.45554]

                        let f = tuple_size::<K, V>();

Replacement in sanakirja-core/src/btree/page.rs at line 630 [4.8623]

B:BD[4.39419] → [3.46099:46159]

            let size = core::mem::size_of::<Tuple<K, V>>();

[4.39419]

[4.39476]

            let size = tuple_size::<K, V>();

Replacement in sanakirja-core/src/btree/page/rebalance.rs at line 52 [6.387]
B:BD[6.1916] → [3.46160:46209]
```
    let f = core::mem::size_of::<Tuple<K, V>>();
```
[6.1916]
[3.46209]
```
    let f = tuple_size::<K, V>();
```
Replacement in sanakirja-core/src/btree/page/put.rs at line 64 [6.5929]
B:BD[6.8085] → [3.47427:47480]
```
        let s = core::mem::size_of::<Tuple<K, V>>();
```
[6.8085]
[3.47480]
```
        let s = tuple_size::<K, V>();
```

Replacement in sanakirja-core/src/btree/page/alloc.rs at line 62 [6.17232]

B:BD[6.19432] → [3.47590:47654]

                let size = core::mem::size_of::<Tuple<K, V>>();

[6.19432]

[6.19493]

                let size = tuple_size::<K, V>();

Replacement in sanakirja-core/src/btree/page/alloc.rs at line 76 [6.17232]
∅:D[2.6547] → [3.47666:47719]
B:BD[7.11190] → [3.47666:47719]
```
        let f = core::mem::size_of::<Tuple<K, V>>();
```
[2.6547]
[3.47719]
```
        let f = tuple_size::<K, V>();
```
Replacement in sanakirja-core/src/btree/page/alloc.rs at line 100 [6.17232]
B:BD[6.21047] → [3.48085:48138]
```
        let f = core::mem::size_of::<Tuple<K, V>>();
```
[6.21047]
[3.48138]
```
        let f = tuple_size::<K, V>();
```
Replacement in sanakirja-core/src/btree/page/alloc.rs at line 145 [6.17232]
B:BD[6.23632] → [3.49387:49440]
```
        let f = core::mem::size_of::<Tuple<K, V>>();
```
[6.23632]
[2.7284]
```
        let f = tuple_size::<K, V>();
```
Replacement in sanakirja-core/src/btree/page/alloc.rs at line 219 [6.17232]
B:BD[6.27048] → [3.50045:50098]
```
        let f = core::mem::size_of::<Tuple<K, V>>();
```
[6.27048]
[2.7767]
```
        let f = tuple_size::<K, V>();
```

Insertion in sanakirja-core/src/btree/mod.rs at line 140 [4.45735]

[4.48665]

[2.8946]

    type Saved;
    fn save_deleted_leaf_entry(k: &K, v: &V) -> Self::Saved;
    unsafe fn from_saved<'a>(s: &Self::Saved) -> (&'a K, &'a V);

Replacement in sanakirja-core/src/btree/del.rs at line 21 [4.52511]

B:BD[5.31281] → [7.15847:15929]

    K: Representable + core::fmt::Debug,
    V: Representable + core::fmt::Debug,

[5.31281]

[7.15929]

    K: Representable + ?Sized + core::fmt::Debug,
    V: Representable + ?Sized + core::fmt::Debug,

Replacement in sanakirja-core/src/btree/del.rs at line 40 [4.52511]

B:BD[5.31418] → [7.16004:16086]

    K: Representable + core::fmt::Debug,
    V: Representable + core::fmt::Debug,

[5.31418]

[7.16086]

    K: Representable + ?Sized + core::fmt::Debug,
    V: Representable + ?Sized + core::fmt::Debug,

Replacement in sanakirja-core/src/btree/del.rs at line 71 [4.52511]

B:BD[7.16907] → [7.16907:17066]

    let mut k0 = MaybeUninit::uninit();
    let mut v0 = MaybeUninit::uninit();
    let (mut last_op, k0v0) = leaf_delete(txn, cursor, p0, &mut k0, &mut v0)?;

[7.16907]

[4.55545]

    let (mut last_op, k0v0) = leaf_delete(txn, cursor, p0)?;

Replacement in sanakirja-core/src/btree/del.rs at line 85 [4.52511]

B:BD[7.17471] → [7.17471:17537]

        let mut concat = concat(txn, cursor, p0, k0v0, last_op)?;

[7.17471]

[6.30945]

        let mut concat = concat(txn, cursor, p0, &k0v0, last_op)?;

Replacement in sanakirja-core/src/btree/del.rs at line 97 [4.52511]

B:BD[6.31025] → [7.17790:17869]

        last_op = handle_merge(txn, cursor, p0, k0v0, mil, merge, &mut free)?;

[6.31025]

[4.59562]

        last_op = handle_merge(txn, cursor, p0, &k0v0, mil, merge, &mut free)?;

Replacement in sanakirja-core/src/btree/del.rs at line 131 [4.52511]

B:BD[4.61149] → [7.18162:18206]

    K: Representable,
    V: Representable,

[4.61149]

[7.18206]

    K: Representable + ?Sized,
    V: Representable + ?Sized,

Replacement in sanakirja-core/src/btree/del.rs at line 161 [4.52511]

B:BD[6.31607] → [7.18288:18370]

    K: Representable + core::fmt::Debug,
    V: Representable + core::fmt::Debug,

[6.31607]

[7.18370]

    K: Representable + ?Sized + core::fmt::Debug,
    V: Representable + ?Sized + core::fmt::Debug,

Replacement in sanakirja-core/src/btree/del.rs at line 168 [4.52511]

B:BD[6.31816] → [7.18457:18598]

    k0: &'a mut MaybeUninit<K>,
    v0: &'a mut MaybeUninit<V>,
) -> Result<(ModifiedPage<'a, K, V, P>, Option<(&'a K, &'a V)>), T::Error> {

[6.31816]

[7.18598]

) -> Result<(ModifiedPage<'a, K, V, P>, Option<P::Saved>), T::Error> {

Replacement in sanakirja-core/src/btree/del.rs at line 193 [4.52511]

B:BD[6.33162] → [7.18937:19272]

            if K::SIZE.is_some() && V::SIZE.is_some() {
                core::ptr::copy_nonoverlapping(k, k0.as_mut_ptr(), 1);
                core::ptr::copy_nonoverlapping(v, v0.as_mut_ptr(), 1);
                deleted = Some((&*k0.as_ptr(), &*v0.as_ptr()))
            } else {
                deleted = Some((k, v))
            }

[6.33162]

[6.33296]

            deleted = Some(P::save_deleted_leaf_entry(k, v))

Replacement in sanakirja-core/src/btree/del.rs at line 215 [4.52511]

B:BD[4.61838] → [7.19291:19335]

    K: Representable,
    V: Representable,

[4.61838]

[7.19335]

    K: Representable + ?Sized,
    V: Representable + ?Sized,

Replacement in sanakirja-core/src/btree/del.rs at line 222 [4.52511]
B:BD[6.33675] → [7.19417:19451]
```
    k0v0: Option<(&'a K, &'a V)>,
```
[6.33675]
[7.19451]
```
    k0v0: &Option<P::Saved>,
```

Replacement in sanakirja-core/src/btree/del.rs at line 229 [4.52511]

B:BD[6.33809] → [7.19537:19576]

        if let Some((k0, v0)) = k0v0 {

[6.33809]

[7.19576]

        if let Some(s) = k0v0 {
            let (k0, v0) = unsafe { P::from_saved(s) };

Replacement in sanakirja-core/src/btree/del.rs at line 267 [4.52511]

B:BD[6.34015] → [7.20034:20078]

    K: Representable,
    V: Representable,

[6.34015]

[7.20078]

    K: Representable + ?Sized,
    V: Representable + ?Sized,

Replacement in sanakirja-core/src/btree/del.rs at line 274 [4.52511]
B:BD[6.34186] → [7.20160:20194]
```
    k0v0: Option<(&'a K, &'a V)>,
```
[6.34186]
[6.34236]
```
    k0v0: &Option<P::Saved>,
```

Replacement in sanakirja-core/src/btree/del.rs at line 321 [4.52511]

B:BD[6.35756] → [7.20247:20283]

                last_op.ins = k0v0;

[6.35756]

[6.35835]

                if let Some(k0v0) = k0v0 {
                    last_op.ins = Some(unsafe { P::from_saved(k0v0) });
                }

Replacement in sanakirja-core/src/btree/del.rs at line 350 [4.52511]

B:BD[6.36738] → [7.20284:20320]

                last_op.ins = k0v0;

[6.36738]

[6.36817]

                if let Some(k0v0) = k0v0 {
                    last_op.ins = Some(unsafe { P::from_saved(k0v0) });
                }

Replacement in sanakirja-core/src/btree/del.rs at line 369 [4.52511]

B:BD[6.37595] → [7.20321:20385]

            let split_key_is_k0 = if let Some((k0, _)) = k0v0 {

[6.37595]

[7.20385]

            let split_key_is_k0 = if let Some(k0v0) = k0v0 {
                let (k0, _) = unsafe { P::from_saved(k0v0) };

Replacement in sanakirja-core/src/btree/del.rs at line 394 [4.52511]

B:BD[7.20849] → [2.10493:10588]

fn modify_rc<T: AllocPage + LoadPage, K: Representable, V: Representable, P: BTreePage<K, V>>(

[7.20849]

[4.62957]

fn modify_rc<
    T: AllocPage + LoadPage,
    K: Representable + ?Sized,
    V: Representable + ?Sized,
    P: BTreePage<K, V>,
>(

Replacement in sanakirja-core/src/btree/del.rs at line 483 [4.52511]

B:BD[6.38259] → [7.23372:23454]

    K: Representable + core::fmt::Debug,
    V: Representable + core::fmt::Debug,

[6.38259]

[7.23454]

    K: Representable + ?Sized + core::fmt::Debug,
    V: Representable + ?Sized + core::fmt::Debug,

Replacement in sanakirja-core/src/btree/del.rs at line 490 [4.52511]
B:BD[7.23568] → [7.23568:23596]
```
    k0v0: Option<(&K, &V)>,
```
[7.23568]
[6.38514]
```
    k0v0: Option<P::Saved>,
```

Replacement in sanakirja-core/src/btree/del.rs at line 535 [4.52511]

B:BD[6.39331] → [7.24096:24160]

            let split_key_is_k0 = if let Some((k0, _)) = k0v0 {

[6.39331]

[7.24160]

            let split_key_is_k0 = if let Some(ref k0v0) = k0v0 {
                let (k0, _) = unsafe { P::from_saved(k0v0) };