{"header":{"message":"Debugging","description":null,"timestamp":"2021-02-23T19:24:20.592186638Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"L5CVF6UJYR6FRQA2NULFHGQFID7BGM4D622OJ2TVWRU7EAR57DHAC","authors":[],"deps":{"hashes":[["L5CVF6UJYR6FRQA2NULFHGQFID7BGM4D622OJ2TVWRU7EAR57DHAC","Debugging"],["AA",null],["52X5P7NDBQHIJDIYNY3XUPDHHOO3PDPPNKGO2PGLXKVNM3EVECTQC","Cleaning up the unsized part"],["E4MD6T3LNOYWVFTFFWCUKRNS4M2XVSKRLDWPYHMZHGDNO2T5JREQC","Proofreading and commenting of this crate (massive bug fixes included)"],["Q7DRIBBRE4MNG4NP3PVIXAJF5PQYLFWYIVK2O4VVLEO6XY3BOSFQC","Debugging replace (which cannot be del+put)"],["LSQ6V7M66TEGLJ7QBLRVDX4E7UKJTDQTEXZOS3KGPGFKVXNLPKBQC","Cleanup + docs"],["TSMS6W4DOKQNUQ4PEMTLOIODR33VFPN6MMNS73ZPSU4BOQVRGPNAC","Fully commented implementation of Sized nodes + massive cleanup"],["OTWDDJE7TTE73D6BGF4ZN6BH2NFUFLPME2VJ3CPALH463UGWLEIQC","Trait/type cleanup"],["H3FVSQIQGFCFKCPXVOSFHP4OSUOBBURJESCZNGQTNDAAD3WQSBEQC","Unsized pages"],["QEUTVAZ4F4EJXRDMWDMYXF6XEDMX7YPVG4IIXEKPIR3K54E5W5OAC","Splitting btree::page"],["73Z2UB3JGRLFNFORE7D64O4IHIFSZASD4G4FLJ4FJLHANT75MGIAC","Cleanup + comments"],["ESUI5EUZUBDPHNN3APU33IFORYPYR6J3WEMEZG57FKF3EH66ZBHAC","Making as_page() unsafe"],["LROAI3NBBSCU4T2YA6EHJYKKKL75AU5A7C7WIRCGIQ56S6HPLRXQC","Two iterators (convenience functions), along with tests to move cursors (put and del still destroy cursors though)"],["7WJNSPEWJSJROOYHU6QROWPUZ6WNIOUG2BPSOPDPCK6RG2NQU6OQC","Using the same definition of the \"occupied\" field uniform everywhere"],["6UVFCERMGSGNRWCVC3GWO5HWV6MSWE433DXBJVC7KRPP6LLJLCSQC","Formatting, debugging, etc."],["HN6Z5DU4WYMAIOOSNVHLIIMNF6Q53TNJ7YC27SLKWNXVYCTACQKQC","Cleanup"],["WS4ZQM4RMIHZ6XZKSDQJGHN5SSSWFL4H236USOPUA33S6RC53RFAC","Debugging, tests, etc."],["DV4A2LR7Q5LAEGAQHLO34PZCHGJUHPAMRZFGT7GUFNKVQKPJNOYQC","Double-inserts (rebalancing near an internal deletion)"],["W26CFMAQOXMUK4ZOJMAN4SMBXMWFQHO7HCTEVW73FQSRMJZFGJIQC","Improving safety of cursors"],["SO25TWFLSRQIVTJTTSN77LO5FZQVQPIZTSBULH7MWBBDEWSK3OCAC","A few features for integrating it into Pijul"],["XEU2QVLCHPYOOD4TQIPEEVYOVSFMKFPLJYWEJYXYJAZ7S54KWDZAC","Debugging after plugging this into Pijul"],["QYDGYIZRNFRIQD7RUCY5YAN3F2THZA74E5UOHPIFWSULEJFAFVJQC","Split trait Representable into its mandatory part and an optional part"],["KX3WVNZW5KHVEH6EOQTZ4RBEFFJ3SGF5I467X3JWZ74PURRK4HVAC","Testing/debugging \"rebalance causes split of the root\""],["OFINGD26ZWCRDVVDI2ZIBLMHXKEMJA6MRNLANJYUHQPIJLPA7J2AC","implementing prev() on cursors (+ some cleanup)"],["T7QB6QEPWBXAU3RL7LE4GRDWWNQ65ZU2YNNTWBYLORJOABAQFEZQC","Adding debug.rs"],["OP6SVMOD2GTQ7VNJ4E5KYFG4MIYA7HBMXJTADALMZH4PY7OQRMZQC","Resetting history"],["X3QVVQIS7B7L3XYZAWL3OOBUXOJ6RMOKQ45YMLLGAHYPEEKZ45ZAC","More debugging (del seems to work now)"],["T73WR2BX2QDQ6APOREBXUKNH52FDLJNBGWPQUYB2TAF2PT7XCL2AC","Cleaner RC increments for keys and values containing references + more comments in `del`"]],"deps":["52X5P7NDBQHIJDIYNY3XUPDHHOO3PDPPNKGO2PGLXKVNM3EVECTQC","E4MD6T3LNOYWVFTFFWCUKRNS4M2XVSKRLDWPYHMZHGDNO2T5JREQC"],"known":["OP6SVMOD2GTQ7VNJ4E5KYFG4MIYA7HBMXJTADALMZH4PY7OQRMZQC","WS4ZQM4RMIHZ6XZKSDQJGHN5SSSWFL4H236USOPUA33S6RC53RFAC","X3QVVQIS7B7L3XYZAWL3OOBUXOJ6RMOKQ45YMLLGAHYPEEKZ45ZAC","DV4A2LR7Q5LAEGAQHLO34PZCHGJUHPAMRZFGT7GUFNKVQKPJNOYQC","QEUTVAZ4F4EJXRDMWDMYXF6XEDMX7YPVG4IIXEKPIR3K54E5W5OAC","OTWDDJE7TTE73D6BGF4ZN6BH2NFUFLPME2VJ3CPALH463UGWLEIQC","H3FVSQIQGFCFKCPXVOSFHP4OSUOBBURJESCZNGQTNDAAD3WQSBEQC","6UVFCERMGSGNRWCVC3GWO5HWV6MSWE433DXBJVC7KRPP6LLJLCSQC","W26CFMAQOXMUK4ZOJMAN4SMBXMWFQHO7HCTEVW73FQSRMJZFGJIQC","T7QB6QEPWBXAU3RL7LE4GRDWWNQ65ZU2YNNTWBYLORJOABAQFEZQC","KX3WVNZW5KHVEH6EOQTZ4RBEFFJ3SGF5I467X3JWZ74PURRK4HVAC","7WJNSPEWJSJROOYHU6QROWPUZ6WNIOUG2BPSOPDPCK6RG2NQU6OQC","SO25TWFLSRQIVTJTTSN77LO5FZQVQPIZTSBULH7MWBBDEWSK3OCAC","OFINGD26ZWCRDVVDI2ZIBLMHXKEMJA6MRNLANJYUHQPIJLPA7J2AC","LROAI3NBBSCU4T2YA6EHJYKKKL75AU5A7C7WIRCGIQ56S6HPLRXQC","XEU2QVLCHPYOOD4TQIPEEVYOVSFMKFPLJYWEJYXYJAZ7S54KWDZAC","Q7DRIBBRE4MNG4NP3PVIXAJF5PQYLFWYIVK2O4VVLEO6XY3BOSFQC","73Z2UB3JGRLFNFORE7D64O4IHIFSZASD4G4FLJ4FJLHANT75MGIAC","HN6Z5DU4WYMAIOOSNVHLIIMNF6Q53TNJ7YC27SLKWNXVYCTACQKQC","ESUI5EUZUBDPHNN3APU33IFORYPYR6J3WEMEZG57FKF3EH66ZBHAC","LSQ6V7M66TEGLJ7QBLRVDX4E7UKJTDQTEXZOS3KGPGFKVXNLPKBQC","QYDGYIZRNFRIQD7RUCY5YAN3F2THZA74E5UOHPIFWSULEJFAFVJQC","TSMS6W4DOKQNUQ4PEMTLOIODR33VFPN6MMNS73ZPSU4BOQVRGPNAC"]},"hunks":[{"Replacement":{"inode":{"change":4,"pos":2014},"path":"sanakirja-core/src/btree/page_unsized.rs","line":544,"ins":{"up_context":[{"change":4,"pos":10907}],"down_context":[{"change":2,"pos":16622}],"flag":"BLOCK","start":0,"end":46,"inode":{"change":4,"pos":2014}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":10907},"to":{"change":4,"start":10907,"end":10928},"introduced_by":4}],"inode":{"change":4,"pos":2014}},"ins_contents":[{"Add":" } else if m.modified.skip_first {"}],"del_contents":[{"Del":" } else {\n"}]}},{"Edit":{"inode":{"change":4,"pos":2014},"path":"sanakirja-core/src/btree/page_unsized.rs","line":554,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":1768}],"down_context":[{"change":4,"pos":11117}],"flag":"BLOCK","start":47,"end":532,"inode":{"change":4,"pos":2014}}},"contents":[{"Add":" } else {"},{"Add":" let mut c1 = m.modified.c1.clone();"},{"Add":" let mut l = m.modified.l;"},{"Add":" if l == 0 {"},{"Add":" Self::move_next(&mut c1);"},{"Add":" l = m.modified.r;"},{"Add":" }"},{"Add":" return Ok(Op::Put(Put::Ok(Self::update_left_child("},{"Add":" txn,"},{"Add":" m.modified.page,"},{"Add":" m.modified.mutable,"},{"Add":" &c1,"},{"Add":" l,"},{"Add":" )?)));"}]}},{"Replacement":{"inode":{"change":4,"pos":22926},"path":"sanakirja-core/src/btree/page_unsized/rebalance.rs","line":31,"ins":{"up_context":[{"change":4,"pos":5051}],"down_context":[{"change":4,"pos":23842}],"flag":"BLOCK","start":533,"end":612,"inode":{"change":4,"pos":22926}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":5051},"to":{"change":4,"start":1615,"end":1679},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1976},"to":{"change":4,"start":1615,"end":1679},"introduced_by":4}],"inode":{"change":4,"pos":22926}},"ins_contents":[{"Add":" let new_left = if let Put::Ok(Ok { page, freed }) = >::put("}],"del_contents":[{"Del":" if let Put::Ok(Ok { page, freed }) = >::put(\n"}]}},{"Edit":{"inode":{"change":4,"pos":22926},"path":"sanakirja-core/src/btree/page_unsized/rebalance.rs","line":50,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":24133}],"down_context":[{"change":4,"pos":24133}],"flag":"BLOCK","start":613,"end":1126,"inode":{"change":4,"pos":22926}}},"contents":[{"Add":" };"},{"Add":" // Append the middle element of the concatenation at the end"},{"Add":" // of the left page. We know the left page to be mutable by"},{"Add":" // now, and we also know there's enough space to do this."},{"Add":" let lc = PageCursor::after(&new_left.0);"},{"Add":" if let Put::Ok(Ok { freed, page }) = >::put("},{"Add":" txn, new_left.0, true, false, &lc, m.mid.0, m.mid.1, None, 0, rl,"},{"Add":" )? {"},{"Add":" assert_eq!(freed, 0);"},{"Add":" page"},{"Add":" } else {"},{"Add":" unreachable!()"}]}},{"Replacement":{"inode":{"change":4,"pos":22926},"path":"sanakirja-core/src/btree/page_unsized/rebalance.rs","line":63,"ins":{"up_context":[{"change":4,"pos":24143}],"down_context":[{"change":4,"pos":5107}],"flag":"BLOCK","start":1127,"end":1165,"inode":{"change":4,"pos":22926}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":24143},"to":{"change":4,"start":24143,"end":24156},"introduced_by":4}],"inode":{"change":4,"pos":22926}},"ins_contents":[{"Add":" } else if m.modified.skip_first {"}],"del_contents":[{"Del":" } else {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":22926},"path":"sanakirja-core/src/btree/page_unsized/rebalance.rs","line":76,"ins":{"up_context":[{"change":4,"pos":994}],"down_context":[{"change":4,"pos":1018}],"flag":"BLOCK","start":1166,"end":1671,"inode":{"change":4,"pos":22926}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":994},"to":{"change":4,"start":2109,"end":2129},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2129},"to":{"change":2,"start":22005,"end":22196},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":22196},"to":{"change":4,"start":5210,"end":5330},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2129},"to":{"change":4,"start":5210,"end":5330},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":5330},"to":{"change":4,"start":1759,"end":1842},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1759},"to":{"change":4,"start":1759,"end":1842},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2375},"to":{"change":4,"start":2375,"end":2405},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2405},"to":{"change":4,"start":5331,"end":5344},"introduced_by":4}],"inode":{"change":4,"pos":22926}},"ins_contents":[{"Add":" // Append the middle element of the concatenation at the end"},{"Add":" // of the left page. We know the left page to be mutable by"},{"Add":" // now, and we also know there's enough space to do this."},{"Add":" let lc = PageCursor::after(&page.0);"},{"Add":" if let Put::Ok(Ok { freed, page }) = >::put("},{"Add":" txn, page.0, true, false, &lc, m.mid.0, m.mid.1, None, 0, rl,"},{"Add":" )? {"},{"Add":" assert_eq!(freed, 0);"},{"Add":" page"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" }"},{"Add":""}],"del_contents":[{"Del":" page\n };\n"},{"Del":" // Append the middle element of the concatenation at the end of\n // the left page. We know the left page to be mutable by now, and\n // we also know there's enough space to do this.\n"},{"Del":" let lc = PageCursor::after(&new_left.0);\n let new_left = if let Put::Ok(Ok { freed, page }) = >::put(\n"},{"Del":" txn, new_left.0, true, false, &lc, m.mid.0, m.mid.1, None, 0, rl,\n )? {\n"},{"Del":" assert_eq!(freed, 0);\n"},{"Del":" page\n"}]}},{"Replacement":{"inode":{"change":4,"pos":22926},"path":"sanakirja-core/src/btree/page_unsized/rebalance.rs","line":90,"ins":{"up_context":[{"change":4,"pos":1031}],"down_context":[{"change":4,"pos":1054}],"flag":"BLOCK","start":1672,"end":2359,"inode":{"change":4,"pos":22926}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1031},"to":{"change":4,"start":1031,"end":1054},"introduced_by":4}],"inode":{"change":4,"pos":22926}},"ins_contents":[{"Add":" // Append the middle element of the concatenation at the end"},{"Add":" // of the left page. We know the left page to be mutable by"},{"Add":" // now, and we also know there's enough space to do this."},{"Add":" let is_dirty = m.modified.page.is_dirty();"},{"Add":" let lc = PageCursor::after(&m.modified.page);"},{"Add":" if let Put::Ok(Ok { freed, page }) = >::put("},{"Add":" txn, m.modified.page, m.modified.mutable, false, &lc, m.mid.0, m.mid.1, None, 0, rl,"},{"Add":" )? {"},{"Add":" if freed > 0 {"},{"Add":" let b = if is_dirty { 1 } else { 0 };"},{"Add":" freed_[0] = freed | b;"},{"Add":" }"},{"Add":" page"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" }"}],"del_contents":[{"Del":" unreachable!()\n"}]}},{"Replacement":{"inode":{"change":4,"pos":22926},"path":"sanakirja-core/src/btree/page_unsized/rebalance.rs","line":159,"ins":{"up_context":[{"change":4,"pos":5800}],"down_context":[{"change":4,"pos":25958}],"flag":"BLOCK","start":2360,"end":2429,"inode":{"change":4,"pos":22926}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":5800},"to":{"change":2,"start":23455,"end":23508},"introduced_by":2}],"inode":{"change":4,"pos":22926}},"ins_contents":[{"Add":" let new_right = if let Put::Ok(Ok { page, freed }) = P::put("}],"del_contents":[{"Del":" if let Put::Ok(Ok { page, freed }) = P::put(\n"}]}},{"Replacement":{"inode":{"change":4,"pos":22926},"path":"sanakirja-core/src/btree/page_unsized/rebalance.rs","line":171,"ins":{"up_context":[{"change":4,"pos":26188}],"down_context":[{"change":4,"pos":26188}],"flag":"BLOCK","start":2430,"end":3131,"inode":{"change":4,"pos":22926}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":26188},"to":{"change":2,"start":23545,"end":23611},"introduced_by":2}],"inode":{"change":4,"pos":22926}},"ins_contents":[{"Add":" if freed > 0 {"},{"Add":" freed_[0] = if is_dirty { freed | 1 } else { freed };"},{"Add":" }"},{"Add":" page"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" };"},{"Add":" // Add the middle element of the concatenation as the first"},{"Add":" // element of the right page. We know the right page is"},{"Add":" // mutable, since we just modified it (hence the"},{"Add":" // `assert_eq!(freed, 0)`."},{"Add":" if let Put::Ok(Ok { freed, page }) = P::put("},{"Add":" txn,"},{"Add":" new_right.0,"},{"Add":" true,"},{"Add":" false,"},{"Add":" &rc,"},{"Add":" m.mid.0,"},{"Add":" m.mid.1,"},{"Add":" None,"},{"Add":" r0,"},{"Add":" rl,"},{"Add":" )? {"},{"Add":" debug_assert_eq!(freed, 0);"}],"del_contents":[{"Del":" freed_[0] = if is_dirty { freed | 1 } else { freed };\n"}]}},{"Replacement":{"inode":{"change":4,"pos":22926},"path":"sanakirja-core/src/btree/page_unsized/rebalance.rs","line":199,"ins":{"up_context":[{"change":4,"pos":26259}],"down_context":[{"change":4,"pos":5856}],"flag":"BLOCK","start":3132,"end":3170,"inode":{"change":4,"pos":22926}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":26259},"to":{"change":4,"start":26259,"end":26272},"introduced_by":4}],"inode":{"change":4,"pos":22926}},"ins_contents":[{"Add":" } else if m.modified.skip_first {"}],"del_contents":[{"Del":" } else {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":22926},"path":"sanakirja-core/src/btree/page_unsized/rebalance.rs","line":211,"ins":{"up_context":[{"change":4,"pos":1716}],"down_context":[{"change":4,"pos":26515}],"flag":"BLOCK","start":3171,"end":3755,"inode":{"change":4,"pos":22926}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1716},"to":{"change":4,"start":2830,"end":2850},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2850},"to":{"change":2,"start":23716,"end":23983},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":4,"pos":3234},"to":{"change":4,"start":1987,"end":2144},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":6035},"to":{"change":4,"start":1987,"end":2144},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":2,"pos":23983},"to":{"change":4,"start":1987,"end":2144},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1987},"to":{"change":4,"start":1987,"end":2144},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2144},"to":{"change":2,"start":23984,"end":24020},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":24020},"to":{"change":4,"start":6036,"end":6049},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3070},"to":{"change":4,"start":6036,"end":6049},"introduced_by":4}],"inode":{"change":4,"pos":22926}},"ins_contents":[{"Add":" // Add the middle element of the concatenation as the first"},{"Add":" // element of the right page. We know the right page is"},{"Add":" // mutable, since we just modified it (hence the"},{"Add":" // `assert_eq!(freed, 0)`."},{"Add":" if let Put::Ok(Ok { freed, page }) = P::put("},{"Add":" txn,"},{"Add":" page.0,"},{"Add":" true,"},{"Add":" false,"},{"Add":" &rc,"},{"Add":" m.mid.0,"},{"Add":" m.mid.1,"},{"Add":" None,"},{"Add":" r0,"},{"Add":" rl,"},{"Add":" )? {"},{"Add":" debug_assert_eq!(freed, 0);"},{"Add":" page"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" }"}],"del_contents":[{"Del":" page\n };\n"},{"Del":"\n // Add the middle element of the concatenation as the first\n // element of the right page. We know the right page is mutable,\n // since we just modified it (hence the `assert_eq!(freed, 0)`.\n let new_right = if let Put::Ok(Ok { freed, page }) = P::put(\n"},{"Del":" txn,\n new_right.0,\n true,\n false,\n &rc,\n m.mid.0,\n m.mid.1,\n None,\n r0,\n rl,\n )? {\n"},{"Del":" debug_assert_eq!(freed, 0);\n"},{"Del":" page\n"}]}},{"Replacement":{"inode":{"change":4,"pos":22926},"path":"sanakirja-core/src/btree/page_unsized/rebalance.rs","line":233,"ins":{"up_context":[{"change":4,"pos":26528}],"down_context":[{"change":4,"pos":26551}],"flag":"BLOCK","start":3756,"end":4261,"inode":{"change":4,"pos":22926}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":26528},"to":{"change":4,"start":26528,"end":26551},"introduced_by":4}],"inode":{"change":4,"pos":22926}},"ins_contents":[{"Add":" let is_dirty = m.modified.page.is_dirty();"},{"Add":" if let Put::Ok(Ok { freed, page }) = P::put("},{"Add":" txn,"},{"Add":" m.modified.page,"},{"Add":" m.modified.mutable,"},{"Add":" false,"},{"Add":" &rc,"},{"Add":" m.mid.0,"},{"Add":" m.mid.1,"},{"Add":" None,"},{"Add":" r0,"},{"Add":" rl,"},{"Add":" )? {"},{"Add":" if freed > 0 {"},{"Add":" freed_[0] = if is_dirty { freed | 1 } else { freed };"},{"Add":" }"},{"Add":" page"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" }"}],"del_contents":[{"Del":" unreachable!()\n"}]}},{"Edit":{"inode":{"change":4,"pos":8623},"path":"sanakirja-core/src/btree/page.rs","line":530,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":3351},"to":{"change":4,"start":17114,"end":17149},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":3899},"to":{"change":4,"start":17114,"end":17149},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":5778},"to":{"change":4,"start":17114,"end":17149},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":17114},"to":{"change":4,"start":17114,"end":17149},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":17149},"to":{"change":4,"start":16862,"end":16884},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":16884},"to":{"change":4,"start":7950,"end":7973},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":17176},"to":{"change":4,"start":7950,"end":7973},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":7973},"to":{"change":4,"start":17251,"end":17318},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":17251},"to":{"change":4,"start":17251,"end":17318},"introduced_by":4}],"inode":{"change":4,"pos":8623}}},"contents":[{"Del":" return Ok(Op::Merged {\n"},{"Del":" page,\n"},{"Del":" freed,\n"},{"Del":" marker: core::marker::PhantomData,\n });\n"}]}},{"Replacement":{"inode":{"change":4,"pos":8623},"path":"sanakirja-core/src/btree/page.rs","line":555,"ins":{"up_context":[{"change":4,"pos":3692}],"down_context":[{"change":4,"pos":17533}],"flag":"BLOCK","start":4262,"end":4308,"inode":{"change":4,"pos":8623}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":3692},"to":{"change":4,"start":6288,"end":6309},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":6288},"to":{"change":4,"start":6288,"end":6309},"introduced_by":4}],"inode":{"change":4,"pos":8623}},"ins_contents":[{"Add":" } else if m.modified.skip_first {"}],"del_contents":[{"Del":" } else {\n"}]}},{"Edit":{"inode":{"change":4,"pos":8623},"path":"sanakirja-core/src/btree/page.rs","line":569,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":7893}],"down_context":[{"change":4,"pos":3763}],"flag":"BLOCK","start":4309,"end":4794,"inode":{"change":4,"pos":8623}}},"contents":[{"Add":" } else {"},{"Add":" let mut c1 = m.modified.c1.clone();"},{"Add":" let mut l = m.modified.l;"},{"Add":" if l == 0 {"},{"Add":" Self::move_next(&mut c1);"},{"Add":" l = m.modified.r;"},{"Add":" }"},{"Add":" return Ok(Op::Put(Put::Ok(Self::update_left_child("},{"Add":" txn,"},{"Add":" m.modified.page,"},{"Add":" m.modified.mutable,"},{"Add":" &c1,"},{"Add":" l,"},{"Add":" )?)));"}]}},{"Replacement":{"inode":{"change":4,"pos":387},"path":"sanakirja-core/src/btree/page/rebalance.rs","line":29,"ins":{"up_context":[{"change":4,"pos":9149}],"down_context":[{"change":4,"pos":1336}],"flag":"BLOCK","start":4795,"end":4870,"inode":{"change":4,"pos":387}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":9149},"to":{"change":4,"start":8369,"end":8433},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1271},"to":{"change":4,"start":8369,"end":8433},"introduced_by":4}],"inode":{"change":4,"pos":387}},"ins_contents":[{"Add":" let page = if let Put::Ok(Ok { page, freed }) = >::put("}],"del_contents":[{"Del":" if let Put::Ok(Ok { page, freed }) = >::put(\n"}]}},{"Edit":{"inode":{"change":4,"pos":387},"path":"sanakirja-core/src/btree/page/rebalance.rs","line":49,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":1627}],"down_context":[{"change":4,"pos":1627}],"flag":"BLOCK","start":4871,"end":5376,"inode":{"change":4,"pos":387}}},"contents":[{"Add":" };"},{"Add":" // Append the middle element of the concatenation at the end"},{"Add":" // of the left page. We know the left page to be mutable by"},{"Add":" // now, and we also know there's enough space to do this."},{"Add":" let lc = PageCursor::after(&page.0);"},{"Add":" if let Put::Ok(Ok { page, freed }) = >::put("},{"Add":" txn, page.0, true, false, &lc, m.mid.0, m.mid.1, None, 0, rl,"},{"Add":" )? {"},{"Add":" assert_eq!(freed, 0);"},{"Add":" page"},{"Add":" } else {"},{"Add":" unreachable!()"}]}},{"Replacement":{"inode":{"change":4,"pos":387},"path":"sanakirja-core/src/btree/page/rebalance.rs","line":62,"ins":{"up_context":[{"change":4,"pos":1637}],"down_context":[{"change":4,"pos":9205}],"flag":"BLOCK","start":5377,"end":5415,"inode":{"change":4,"pos":387}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1637},"to":{"change":4,"start":1637,"end":1650},"introduced_by":4}],"inode":{"change":4,"pos":387}},"ins_contents":[{"Add":" } else if m.modified.skip_first {"}],"del_contents":[{"Del":" } else {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":387},"path":"sanakirja-core/src/btree/page/rebalance.rs","line":76,"ins":{"up_context":[{"change":4,"pos":8163}],"down_context":[{"change":4,"pos":2754}],"flag":"BLOCK","start":5416,"end":5920,"inode":{"change":4,"pos":387}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":8163},"to":{"change":4,"start":8163,"end":8176},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":4690},"to":{"change":4,"start":1729,"end":1736},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":8176},"to":{"change":4,"start":1729,"end":1736},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1729},"to":{"change":4,"start":1729,"end":1736},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1736},"to":{"change":4,"start":22981,"end":23173},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":23173},"to":{"change":4,"start":9308,"end":9428},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1736},"to":{"change":4,"start":9308,"end":9428},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":9428},"to":{"change":4,"start":8513,"end":8596},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":8513},"to":{"change":4,"start":8513,"end":8596},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":8596},"to":{"change":4,"start":9429,"end":9472},"introduced_by":4}],"inode":{"change":4,"pos":387}},"ins_contents":[{"Add":" // Append the middle element of the concatenation at the end"},{"Add":" // of the left page. We know the left page to be mutable by"},{"Add":" // now, and we also know there's enough space to do this."},{"Add":" let lc = PageCursor::after(&page.0);"},{"Add":" if let Put::Ok(Ok { page, freed }) = >::put("},{"Add":" txn, page.0, true, false, &lc, m.mid.0, m.mid.1, None, 0, rl,"},{"Add":" )? {"},{"Add":" assert_eq!(freed, 0);"},{"Add":" page"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" }"}],"del_contents":[{"Del":" page\n"},{"Del":" };\n"},{"Del":"\n // Append the middle element of the concatenation at the end of\n // the left page. We know the left page to be mutable by now, and\n // we also know there's enough space to do this.\n"},{"Del":" let lc = PageCursor::after(&new_left.0);\n let new_left = if let Put::Ok(Ok { page, freed }) = >::put(\n"},{"Del":" txn, new_left.0, true, false, &lc, m.mid.0, m.mid.1, None, 0, rl,\n )? {\n"},{"Del":" assert_eq!(freed, 0);\n page\n"}]}},{"Replacement":{"inode":{"change":4,"pos":387},"path":"sanakirja-core/src/btree/page/rebalance.rs","line":89,"ins":{"up_context":[{"change":4,"pos":2767}],"down_context":[{"change":4,"pos":2790}],"flag":"BLOCK","start":5921,"end":6463,"inode":{"change":4,"pos":387}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2767},"to":{"change":4,"start":2767,"end":2790},"introduced_by":4}],"inode":{"change":4,"pos":387}},"ins_contents":[{"Add":" let is_dirty = m.modified.page.is_dirty();"},{"Add":" let lc = PageCursor::after(&m.modified.page);"},{"Add":" if let Put::Ok(Ok { page, freed }) = >::put("},{"Add":" txn, m.modified.page, m.modified.mutable, false, &lc, m.mid.0, m.mid.1, None, 0, rl,"},{"Add":" )? {"},{"Add":" if freed > 0 {"},{"Add":" debug!(\"freed {:?} {:?}\", line!(), freed);"},{"Add":" let b = if is_dirty { 1 } else { 0 };"},{"Add":" freed_[0] = freed | b"},{"Add":" }"},{"Add":" page"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" }"}],"del_contents":[{"Del":" unreachable!()\n"}]}},{"Replacement":{"inode":{"change":4,"pos":5929},"path":"sanakirja-core/src/btree/page/put.rs","line":22,"ins":{"up_context":[{"change":2,"pos":39373}],"down_context":[{"change":2,"pos":39450}],"flag":"BLOCK","start":6464,"end":6522,"inode":{"change":4,"pos":5929}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":39373},"to":{"change":2,"start":39373,"end":39450},"introduced_by":2}],"inode":{"change":4,"pos":5929}},"ins_contents":[{"Add":" if mutable && is_dirty && L::can_alloc::(hdr) {"}],"del_contents":[{"Del":" if mutable && is_dirty && L::can_alloc::(header(page.as_page())) {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":5929},"path":"sanakirja-core/src/btree/page/put.rs","line":46,"ins":{"up_context":[{"change":4,"pos":7103}],"down_context":[{"change":2,"pos":40015}],"flag":"BLOCK","start":6523,"end":6578,"inode":{"change":4,"pos":5929}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":7103},"to":{"change":2,"start":39971,"end":40015},"introduced_by":2}],"inode":{"change":4,"pos":5929}},"ins_contents":[{"Add":" } else if replace || L::can_compact::(hdr) {"}],"del_contents":[{"Del":" } else if L::can_compact::(hdr) {\n"}]}},{"Edit":{"inode":{"change":4,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":473,"atom":{"NewVertex":{"up_context":[{"change":28,"pos":5671}],"down_context":[{"change":28,"pos":5671}],"flag":"BLOCK","start":6579,"end":6736,"inode":{"change":4,"pos":52511}}},"contents":[{"Add":" if !mod_is_left {"},{"Add":" let curs = cursor.current_mut();"},{"Add":" P::move_prev(&mut curs.cursor);"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":4,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":717,"ins":{"up_context":[{"change":4,"pos":13152}],"down_context":[{"change":4,"pos":13152}],"flag":"BLOCK","start":6737,"end":6964,"inode":{"change":4,"pos":52511}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":13152},"to":{"change":4,"start":13383,"end":13649},"introduced_by":4}],"inode":{"change":4,"pos":52511}},"ins_contents":[{"Add":" // If there's no insertion, and `m.l == 0`, we need to"},{"Add":" // update the right child of the current entry. The"},{"Add":" // following moves one step to the right and updates the"},{"Add":" // left child:"}],"del_contents":[{"Del":" // If there's no insertion, and `m.l == 0`, we are\n // actually deleting an entry of the root, and so we need\n // to update the right child of the current entry. The\n // following moves one step to the right and updates:\n"}]}},{"Replacement":{"inode":{"change":4,"pos":63682},"path":"sanakirja-core/src/btree/cursor.rs","line":36,"ins":{"up_context":[{"change":4,"pos":65195}],"down_context":[{"change":4,"pos":38975}],"flag":"BLOCK","start":6965,"end":7049,"inode":{"change":4,"pos":63682}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":65195},"to":{"change":4,"start":38910,"end":38975},"introduced_by":4}],"inode":{"change":4,"pos":63682}},"ins_contents":[{"Add":"impl> Cursor {"}],"del_contents":[{"Del":"impl> Cursor {\n"}]}},{"Edit":{"inode":{"change":4,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":355,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":13077}],"down_context":[{"change":4,"pos":86200}],"flag":"BLOCK","start":7050,"end":7081,"inode":{"change":4,"pos":80166}}},"contents":[{"Add":" assert_ne!(offset, 0);"}]}},{"Edit":{"inode":{"change":4,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":364,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":13123}],"down_context":[{"change":4,"pos":86294}],"flag":"BLOCK","start":7082,"end":7113,"inode":{"change":4,"pos":80166}}},"contents":[{"Add":" assert_ne!(offset, 0);"}]}},{"Edit":{"inode":{"change":4,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":441,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":37584}],"down_context":[{"change":3,"pos":18520}],"flag":"BLOCK","start":7114,"end":7149,"inode":{"change":4,"pos":80166}}},"contents":[{"Add":" assert_ne!(offset, 0);"}]}},{"Edit":{"inode":{"change":4,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":451,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":37871}],"down_context":[{"change":3,"pos":18574}],"flag":"BLOCK","start":7150,"end":7189,"inode":{"change":4,"pos":80166}}},"contents":[{"Add":" assert_ne!(offset, 0);"}]}},{"Replacement":{"inode":{"change":4,"pos":11},"path":"sanakirja/src/debug.rs","line":53,"ins":{"up_context":[{"change":4,"pos":1275}],"down_context":[{"change":4,"pos":1310}],"flag":"BLOCK","start":7190,"end":7228,"inode":{"change":4,"pos":11}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1275},"to":{"change":4,"start":1275,"end":1310},"introduced_by":4}],"inode":{"change":4,"pos":11}},"ins_contents":[{"Add":" {} {}\\\";\\ncolor=black;\","}],"del_contents":[{"Del":" {}\\\";\\ncolor=black;\",\n"}]}},{"Replacement":{"inode":{"change":4,"pos":11},"path":"sanakirja/src/debug.rs","line":56,"ins":{"up_context":[{"change":4,"pos":1354}],"down_context":[{"change":4,"pos":1392}],"flag":"BLOCK","start":7229,"end":7344,"inode":{"change":4,"pos":11}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1354},"to":{"change":4,"start":1354,"end":1392},"introduced_by":4}],"inode":{"change":4,"pos":11}},"ins_contents":[{"Add":" txn.rc(p.offset).unwrap(),"},{"Add":" unsafe { u64::from_le(*(p.data as *const u64).add(1)) & 0xfff }"}],"del_contents":[{"Del":" txn.rc(p.offset).unwrap()\n"}]}}],"owner":"pijul","repo":"sanakirja","token":"hTZHhB7vMuHkMoybfsWLbrQjc7QYcOex46Uwv9Fp5TQ=","login":null}

…

Dependencies

Change contents