pijul/sanakirja - Change FREPDP7BFOY6H7NJORRJAMJMZQAC4ZSBMOLNBXQTDFFF4PZQIDYQC

add simple parametric rc impl

Created by 9FZSPF6U3oQmpTwxvCnadrHKQEqTkEpnrDg1UWw9Zo9E on October 26, 2021

FREPDP7BFOY6H7NJORRJAMJMZQAC4ZSBMOLNBXQTDFFF4PZQIDYQC

Dependencies

In discussions

#5 make rc overflow an error variant

Change contents

Replacement in "sanakirja/src/environment/muttxn.rs" at line 11 [4.80166]

B:BD[3.76] → [3.76:119]

pub trait RcEntry: PartialEq + Storable {}

[3.76]

[5.82]

pub trait RcEntry: PartialEq + Storable {
    fn from_page_count(page: u64, count: u64) -> Self;
    fn page(&self) -> u64;
    fn count(&self) -> u64;
}

Replacement in "sanakirja/src/environment/muttxn.rs" at line 17 [4.80166]

B:BD[5.83] → [5.83:107]

impl RcEntry for u64 {}

[5.83]

[2.83]

impl RcEntry for u64 {
    fn from_page_count(page: u64, count: u64) -> Self {
        assert!(count <= 0xfff);
        page | count
    }

Replacement in "sanakirja/src/environment/muttxn.rs" at line 23 [4.80166]

B:BD[2.84] → [2.84:147]

pub type MutTxn<E: Borrow<Env>, T> = GenericMutTxn<E, T, u64>;

[2.84]

[6.37287]

    fn page(&self) -> u64 {
        *self & !0xfff
    }
    fn count(&self) -> u64 {
        *self & 0xfff
    }
}
/// A mutable transaction using 12 bits for the reference counting.
pub type MutTxn<E, T> = GenericMutTxn<E, T, u64>;

Replacement in "sanakirja/src/environment/muttxn.rs" at line 106 [4.80166]

B:BD[7.8146] → [5.300:405]

impl<'a, E: Borrow<Env>, T, R: RcEntry> Commit for GenericMutTxn<E, &'a mut GenericMutTxn<E, T, R>, R> {

[7.8146]

[6.37309]

impl<'a, E: Borrow<Env>, T, R: RcEntry> Commit
    for GenericMutTxn<E, &'a mut GenericMutTxn<E, T, R>, R>
{

Replacement in "sanakirja/src/environment/muttxn.rs" at line 173 [4.80166]

B:BD[4.82078] → [5.406:512]

    pub fn mut_txn_begin<E: Borrow<Self>, R: RcEntry>(env: E) -> Result<GenericMutTxn<E, (), R>, Error> {

[4.82078]

[4.82162]

    pub fn mut_txn_begin<E: Borrow<Self>, R: RcEntry>(
        env: E,
    ) -> Result<GenericMutTxn<E, (), R>, Error> {

Replacement in "sanakirja/src/environment/muttxn.rs" at line 515 [4.80166]

B:BD[8.16374] → [9.19922:19963]

            curs.set(self, &off, None)?;

[8.16374]

[9.19963]

            curs.set(self, &R::from_page_count(off, 0), None)?;

Replacement in "sanakirja/src/environment/muttxn.rs" at line 517 [4.80166]
∅:D[7.19070] → [6.38483:38524]
∅:D[9.20029] → [6.38483:38524]
B:BD[6.38483] → [6.38483:38524]
B:BD[6.38524] → [7.19071:19103]
```
                if *rc & !0xfff == off {
                    *rc & 0xfff
```
[9.20029]
[6.38548]
```
                if rc.page() == off {
                    rc.count()
```
Replacement in "sanakirja/src/environment/muttxn.rs" at line 529 [4.80166]
∅:D[10.2478] → [7.19176:19279]
∅:D[11.2540] → [7.19176:19279]
∅:D[9.20082] → [7.19176:19279]
B:BD[4.89127] → [7.19176:19279]
```
            assert!(rc + 1 <= 0xfff);
            btree::put(self, &mut rc_, &(off | (rc + 1)), &())?;
```
[11.2540]
[7.19279]
```
            btree::put(self, &mut rc_, &R::from_page_count(off, rc + 1), &())?;
```

Replacement in "sanakirja/src/environment/muttxn.rs" at line 534 [4.80166]

B:BD[7.19411] → [7.19411:19468]

            btree::put(self, &mut rc, &(off | 2), &())?;

[7.19411]

[7.19468]

            btree::put(self, &mut rc, &R::from_page_count(off, 2), &())?;

Replacement in "sanakirja/src/environment/muttxn.rs" at line 568 [4.80166]

B:BD[8.16443] → [12.42107:42148]

            curs.set(self, &off, None)?;

[8.16443]

[7.20319]

            curs.set(self, &R::from_page_count(off, 0), None)?;

Replacement in "sanakirja/src/environment/muttxn.rs" at line 573 [4.80166]

B:BD[6.38994] → [6.38994:39059]

                if *rc & !0xfff == off {
                    *rc

[6.38994]

[6.39059]

                if rc.page() == off {
                    rc.count()

Replacement in "sanakirja/src/environment/muttxn.rs" at line 586 [4.80166]

∅:D[13.1705] → [6.39211:39267]

∅:D[14.2098] → [6.39211:39267]

∅:D[7.20682] → [6.39211:39267]

B:BD[6.39211] → [6.39211:39267]

∅:D[13.1738] → [15.935:971]

B:BD[6.39267] → [15.935:971]

B:BD[15.971] → [15.971:1036]

                btree::del(self, &mut rc_, &rc, None)?;
                if rc & 0xfff > 2 {
                    btree::put(self, &mut rc_, &(rc - 1), &())?;

[7.20682]

[15.1036]

                btree::del(self, &mut rc_, &R::from_page_count(off, rc), None)?;
                if rc.count() > 2 {
                    btree::put(self, &mut rc_, &R::from_page_count(off, rc - 1), &())?;

Replacement in "sanakirja/src/environment/muttxn.rs" at line 596 [4.80166]

B:BD[15.1198] → [13.1739:1793]

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

[15.1198]

[14.2244]

                return Ok(rc as usize - 1);

Replacement in "sanakirja/src/environment/muttxn.rs" at line 633 [4.80166]

B:BD[4.91142] → [14.2581:2653]

∅:D[14.2653] → [4.91357:91440]

B:BD[4.91357] → [4.91357:91440]

            if let Some((rc, _)) = btree::get(self, rc, &page, None)? {
                if *rc & !0xfff == page {
                    let r = *rc & 0xfff;

[4.91142]

[4.91440]

            if let Some((rc, _)) = btree::get(self, rc, &R::from_page_count(page, 0), None)? {
                if rc.page() == page {
                    let r = rc.count();