jcdickinson/pijul - Change SCXMBF3YX34HIMX3IZNRMBLCXY2FSBRNCP6MXJH4UEBXUML45I5AC

Correct ordering of pages in libpijul::tag::copy

Created by pmeunier on July 5, 2021

SCXMBF3YX34HIMX3IZNRMBLCXY2FSBRNCP6MXJH4UEBXUML45I5AC

Dependencies

[2] QL6K2ZM35B3NIXEMMCJWUSFXOBQHAGXRDMO7ID5DCKTJH4QJVY7QC

In channels

main

Change contents

Replacement in libpijul/src/tag.rs at line 295 [2.6397]

B:BD[2.14212] → [2.14212:14371]

            P::set_left_child(
                &mut new_page_,
                &new_curs,
                P::left_child(page.as_page(), &curs),
            );

[2.14212]

[2.14371]

            let left = P::left_child(page.as_page(), &curs);
            if left != 0 {
                assert!(dict.insert(left));
                let new_page = txn.txn.alloc_page()?;
                let off = new_page.0.offset;
                P::set_left_child(
                    &mut new_page_,
                    &new_curs,
                    off,
                );
                pending.push((left, new_page));
            }

Replacement in libpijul/src/tag.rs at line 308 [2.6397]

B:BD[2.14381] → [2.14381:14514]

        while let Some((k, v, r)) = P::next(&txn.txn, page.as_page(), &mut curs) {
            let (k, v) = f(file_txn, txn, k, v)?;

[2.14381]

[2.14514]

        while let Some((k_, v_, r)) = P::next(&txn.txn, page.as_page(), &mut curs) {
            let (k, v) = f(file_txn, txn, k_, v_)?;
            assert_eq!(&k, k_);
            assert_eq!(&v, v_);

Replacement in libpijul/src/tag.rs at line 501 [2.6397]
B:BD[2.20280] → [2.20280:20298]
```
    pending: u64,
```
[2.20280]
[2.20298]
```
    pending_: u64,
```

Replacement in libpijul/src/tag.rs at line 508 [2.6397]

B:BD[2.20519] → [2.20519:20569]

    let mut pending = vec![(pending, *new_page)];

[2.20519]

[2.20569]

    let mut pending = std::collections::VecDeque::new();
    pending.push_back((pending_, *new_page));

Replacement in libpijul/src/tag.rs at line 511 [2.6397]

B:BD[2.20605] → [2.20605:20669]

    while let Some((old_page_off, new_page_)) = pending.pop() {

[2.20605]

[2.20669]

    while let Some((old_page_off, new_page_)) = pending.pop_front() {

Replacement in libpijul/src/tag.rs at line 522 [2.6397]

B:BD[2.21109] → [2.21109:21268]

            P::set_left_child(
                &mut new_page_,
                &new_curs,
                P::left_child(page.as_page(), &curs),
            );

[2.21109]

[2.21268]

            let left = P::left_child(page.as_page(), &curs);
            if left != 0 {
                let new = *new_page;
                *new_page += BLOCK_SIZE as u64;
                P::set_left_child(
                    &mut new_page_,
                    &new_curs,
                    new,
                );
                pending.push_back((left, new));
            }

Replacement in libpijul/src/tag.rs at line 539 [2.6397]

B:BD[2.21518] → [2.21518:21558]

                pending.push((r, new));

[2.21518]

[2.21558]

                pending.push_back((r, new));