{"header":{"message":"Refactoring, drop and the Check trait","description":null,"timestamp":"2021-11-23T11:03:02.528734548Z","authors":[{}]},"hash":"OHG5NX6KVGKNA7S7SU3MTPOZCN4RRZK2SGZWZ5LIRXUMCYIPUHIAC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["OHG5NX6KVGKNA7S7SU3MTPOZCN4RRZK2SGZWZ5LIRXUMCYIPUHIAC","Refactoring, drop and the Check trait"],["AA",null],["3QM7P3RRVYYDEJNFDG3GHZDMSSHPPJC3WQOJGETGREOM4I2A6D5AC","Writing the reference counts when committing"],["ECPAFJSBBQ6KMGESKYDMSGPSO32TKLWOUQ4ABALKP6U2IEABWN6AC","add env_borrow for Txn and MutTxn"],["BYI23QWI44ZINCI32VLVG2JJG3WUZFCYEKNNNLLMXMWQCTKZ6PRAC","More tests"],["4Z4GEJTFQFYDOJK3D72LKOFSC5Q42SNL3N6UOYCYW5FXCA67G66AC","Version bump"],["ONES3V466GLO5CXKRF5ENK7VFOQPWM3YXLVRGWB56V5SH3W7XNBQC","reference counting works for put"],["5LSYTRQ6IOVUW26VJW5SWGFEIB7T2N4PVEB6VMNMR5ZHQ75MFOQAC","More docs, example, and fixing the free page diagnostic function for mutable transactions"],["ESUI5EUZUBDPHNN3APU33IFORYPYR6J3WEMEZG57FKF3EH66ZBHAC","Making as_page() unsafe"],["S4V4QZ5CF5LUDYWNR2UMWH6CHJDJ5FPGAZCQYM5GY7FJMJV4NN4QC","Debugging reference-counting for put"],["W2MIZD5BNL7A5HVFWTESF57QU7T6QMEF4RBSLFQXMEEU3XD2NU2QC","Single file databases + CRC for the root pages (checking the other pages makes everything very slow)"],["OP6SVMOD2GTQ7VNJ4E5KYFG4MIYA7HBMXJTADALMZH4PY7OQRMZQC","Resetting history"],["RV2L6CZWTMUQ2A52YDAFVHDFGURZL3H4SSCDC347UGN23D3J5KZQC","A few comments"],["OFINGD26ZWCRDVVDI2ZIBLMHXKEMJA6MRNLANJYUHQPIJLPA7J2AC","implementing prev() on cursors (+ some cleanup)"],["QYDGYIZRNFRIQD7RUCY5YAN3F2THZA74E5UOHPIFWSULEJFAFVJQC","Split trait Representable into its mandatory part and an optional part"],["YWFYZNLZ5JHLIFVBRKZK4TSWVPROUPRG77ZB5M7UHT2OKPL4ZSRQC","Cleanup + inter-process concurrency"],["H3FVSQIQGFCFKCPXVOSFHP4OSUOBBURJESCZNGQTNDAAD3WQSBEQC","Unsized pages"],["PUOGOIJ3SCPHJADRYHIQJXIUQMJFKGFMHY4HWEQI6VQNNDSHVXJAC","Debugging, impls and version bump"],["J7LJZBMEPT37CDNRUTSK2EFCSVG4KU6PM5J7VGNMVXSESUP6H5NAC","Setting reverse cursor to last by default"],["XEU2QVLCHPYOOD4TQIPEEVYOVSFMKFPLJYWEJYXYJAZ7S54KWDZAC","Debugging after plugging this into Pijul"],["R27IKHPAAJTHCVTLIIRI2NCLMTYXRDU6KETMGYARFDZTQW373JHQC","Checking equality when we delete"],["G7K2WSVY2FT4BZ4OKVODP3TJL6ISOTMLO6NHDYLAYYPOS3ZNEI6QC","Fixing unsized iterators"],["DASFQGORX56YK5E4Y7GGYZSQQQMUXYTZZ4A6IVWSTI3QGRUORLPAC","Debugging"],["WS4ZQM4RMIHZ6XZKSDQJGHN5SSSWFL4H236USOPUA33S6RC53RFAC","Debugging, tests, etc."],["KMT3MF5NLEQIPZLHCRYDGQ5EA46HJCG3C2ANEPMZGKGHDK77ADPAC","Drop a database"],["W26CFMAQOXMUK4ZOJMAN4SMBXMWFQHO7HCTEVW73FQSRMJZFGJIQC","Improving safety of cursors"],["TSMS6W4DOKQNUQ4PEMTLOIODR33VFPN6MMNS73ZPSU4BOQVRGPNAC","Fully commented implementation of Sized nodes + massive cleanup"],["52X5P7NDBQHIJDIYNY3XUPDHHOO3PDPPNKGO2PGLXKVNM3EVECTQC","Cleaning up the unsized part"],["6UVFCERMGSGNRWCVC3GWO5HWV6MSWE433DXBJVC7KRPP6LLJLCSQC","Formatting, debugging, etc."],["FZBLNBGNQPNTLBNPNZ2C6DJ5323MZQ2PH54F6ZEKPFCK7TGJFGWAC","Diagnostic tools (add_refs, check_free) + cleanup"],["Z33OHFPA7K246NB5OOAHWTFD7IQTRXNTIED2MZMG3XV2YYQKLRCQC","Version bump"],["77TAHKV4VZ4SWZZBEND24Y6BL7JLRXPYO33CA5FRH53WXEWSWS4QC","Fixing a logical error (again) in del"],["ACB4A27ZMFLRLDAKFRSGAFJRESN3UCVFADQPYCK7TGAIJMSG3FHQC","Code coverage"],["OTWDDJE7TTE73D6BGF4ZN6BH2NFUFLPME2VJ3CPALH463UGWLEIQC","Trait/type cleanup"],["NXMFNPZ7VWJRLC3M5QJJVTICXCMGE24F3HVIZA7A7RLVMLQMLDVQC","Comments + debugging drop"],["GGEFV4YYK7E6J3544XSXN5CBASQI3QE6LTFZCJAGOXHEEKD6BRCQC","Some page splits were not properly handled in deletions"],["7T2CCH3PIKVWIRRLBW7HFUZDD2U3IXR25AWKFTI3GGAXBOHH6RCAC","Fixing a segfault (wrong offset in page_unsized::del)"],["HN6Z5DU4WYMAIOOSNVHLIIMNF6Q53TNJ7YC27SLKWNXVYCTACQKQC","Cleanup"],["SYURNHHL3P22ZAERTML4YW3DYLATHY5ALZH4GL5NF3LENDSKL2NQC","Adding the `put_mut` and `set_left_child` methods"],["FQ567GAX4UNSUUE63QG5QUOIEZH6L2RCHG5YHAO3S5PFKIKPF5DAC","Version bumps"],["P5NWMJ2HEUNVHBCTX3MLALONLMQC7IPUJZKP7Z2IX2E2ZX3UTCOAC","Version bump"],["QEUTVAZ4F4EJXRDMWDMYXF6XEDMX7YPVG4IIXEKPIR3K54E5W5OAC","Splitting btree::page"],["T73WR2BX2QDQ6APOREBXUKNH52FDLJNBGWPQUYB2TAF2PT7XCL2AC","Cleaner RC increments for keys and values containing references + more comments in `del`"],["LSQ6V7M66TEGLJ7QBLRVDX4E7UKJTDQTEXZOS3KGPGFKVXNLPKBQC","Cleanup + docs"],["E4MD6T3LNOYWVFTFFWCUKRNS4M2XVSKRLDWPYHMZHGDNO2T5JREQC","Proofreading and commenting of this crate (massive bug fixes included)"],["DEKK3RUI4GPYQVEYXSFSPNQBK2FP6XJQ5LUITNUSKOZPS4RWBR7AC","Fixing a bug when splitting unsized pages"],["GPP7KJSFUI4RF2XGAB5AWU3ZB5D6QVZLPBHTOSFUUQFGU6P376NQC","Version bump"],["T7QB6QEPWBXAU3RL7LE4GRDWWNQ65ZU2YNNTWBYLORJOABAQFEZQC","Adding debug.rs"],["CCNPHVQCIGINWTLXCHOASGVWUPBZXFOLM2F7HTKMEA2DMFTOX7TAC","Cleanup, comments, renaming"],["2ZRCQBXPCJ5NGPC5SSKNG7PFGDYRYOMWJX7QIAWGXQGDQDQ7GCAQC","Version bump"]],"deps":["3QM7P3RRVYYDEJNFDG3GHZDMSSHPPJC3WQOJGETGREOM4I2A6D5AC","ECPAFJSBBQ6KMGESKYDMSGPSO32TKLWOUQ4ABALKP6U2IEABWN6AC","BYI23QWI44ZINCI32VLVG2JJG3WUZFCYEKNNNLLMXMWQCTKZ6PRAC","4Z4GEJTFQFYDOJK3D72LKOFSC5Q42SNL3N6UOYCYW5FXCA67G66AC"],"known":["OP6SVMOD2GTQ7VNJ4E5KYFG4MIYA7HBMXJTADALMZH4PY7OQRMZQC","WS4ZQM4RMIHZ6XZKSDQJGHN5SSSWFL4H236USOPUA33S6RC53RFAC","ONES3V466GLO5CXKRF5ENK7VFOQPWM3YXLVRGWB56V5SH3W7XNBQC","YWFYZNLZ5JHLIFVBRKZK4TSWVPROUPRG77ZB5M7UHT2OKPL4ZSRQC","QEUTVAZ4F4EJXRDMWDMYXF6XEDMX7YPVG4IIXEKPIR3K54E5W5OAC","S4V4QZ5CF5LUDYWNR2UMWH6CHJDJ5FPGAZCQYM5GY7FJMJV4NN4QC","OTWDDJE7TTE73D6BGF4ZN6BH2NFUFLPME2VJ3CPALH463UGWLEIQC","H3FVSQIQGFCFKCPXVOSFHP4OSUOBBURJESCZNGQTNDAAD3WQSBEQC","6UVFCERMGSGNRWCVC3GWO5HWV6MSWE433DXBJVC7KRPP6LLJLCSQC","KMT3MF5NLEQIPZLHCRYDGQ5EA46HJCG3C2ANEPMZGKGHDK77ADPAC","W26CFMAQOXMUK4ZOJMAN4SMBXMWFQHO7HCTEVW73FQSRMJZFGJIQC","ACB4A27ZMFLRLDAKFRSGAFJRESN3UCVFADQPYCK7TGAIJMSG3FHQC","T7QB6QEPWBXAU3RL7LE4GRDWWNQ65ZU2YNNTWBYLORJOABAQFEZQC","OFINGD26ZWCRDVVDI2ZIBLMHXKEMJA6MRNLANJYUHQPIJLPA7J2AC","XEU2QVLCHPYOOD4TQIPEEVYOVSFMKFPLJYWEJYXYJAZ7S54KWDZAC","T73WR2BX2QDQ6APOREBXUKNH52FDLJNBGWPQUYB2TAF2PT7XCL2AC","NXMFNPZ7VWJRLC3M5QJJVTICXCMGE24F3HVIZA7A7RLVMLQMLDVQC","RV2L6CZWTMUQ2A52YDAFVHDFGURZL3H4SSCDC347UGN23D3J5KZQC","HN6Z5DU4WYMAIOOSNVHLIIMNF6Q53TNJ7YC27SLKWNXVYCTACQKQC","ESUI5EUZUBDPHNN3APU33IFORYPYR6J3WEMEZG57FKF3EH66ZBHAC","LSQ6V7M66TEGLJ7QBLRVDX4E7UKJTDQTEXZOS3KGPGFKVXNLPKBQC","QYDGYIZRNFRIQD7RUCY5YAN3F2THZA74E5UOHPIFWSULEJFAFVJQC","CCNPHVQCIGINWTLXCHOASGVWUPBZXFOLM2F7HTKMEA2DMFTOX7TAC","TSMS6W4DOKQNUQ4PEMTLOIODR33VFPN6MMNS73ZPSU4BOQVRGPNAC","52X5P7NDBQHIJDIYNY3XUPDHHOO3PDPPNKGO2PGLXKVNM3EVECTQC","W2MIZD5BNL7A5HVFWTESF57QU7T6QMEF4RBSLFQXMEEU3XD2NU2QC","E4MD6T3LNOYWVFTFFWCUKRNS4M2XVSKRLDWPYHMZHGDNO2T5JREQC","FZBLNBGNQPNTLBNPNZ2C6DJ5323MZQ2PH54F6ZEKPFCK7TGJFGWAC","GPP7KJSFUI4RF2XGAB5AWU3ZB5D6QVZLPBHTOSFUUQFGU6P376NQC","5LSYTRQ6IOVUW26VJW5SWGFEIB7T2N4PVEB6VMNMR5ZHQ75MFOQAC","DEKK3RUI4GPYQVEYXSFSPNQBK2FP6XJQ5LUITNUSKOZPS4RWBR7AC","DASFQGORX56YK5E4Y7GGYZSQQQMUXYTZZ4A6IVWSTI3QGRUORLPAC","7T2CCH3PIKVWIRRLBW7HFUZDD2U3IXR25AWKFTI3GGAXBOHH6RCAC","SYURNHHL3P22ZAERTML4YW3DYLATHY5ALZH4GL5NF3LENDSKL2NQC","2ZRCQBXPCJ5NGPC5SSKNG7PFGDYRYOMWJX7QIAWGXQGDQDQ7GCAQC","PUOGOIJ3SCPHJADRYHIQJXIUQMJFKGFMHY4HWEQI6VQNNDSHVXJAC","J7LJZBMEPT37CDNRUTSK2EFCSVG4KU6PM5J7VGNMVXSESUP6H5NAC","R27IKHPAAJTHCVTLIIRI2NCLMTYXRDU6KETMGYARFDZTQW373JHQC","Z33OHFPA7K246NB5OOAHWTFD7IQTRXNTIED2MZMG3XV2YYQKLRCQC","77TAHKV4VZ4SWZZBEND24Y6BL7JLRXPYO33CA5FRH53WXEWSWS4QC","GGEFV4YYK7E6J3544XSXN5CBASQI3QE6LTFZCJAGOXHEEKD6BRCQC","FQ567GAX4UNSUUE63QG5QUOIEZH6L2RCHG5YHAO3S5PFKIKPF5DAC","P5NWMJ2HEUNVHBCTX3MLALONLMQC7IPUJZKP7Z2IX2E2ZX3UTCOAC","G7K2WSVY2FT4BZ4OKVODP3TJL6ISOTMLO6NHDYLAYYPOS3ZNEI6QC"]},"hunks":[{"FileMove":{"meta":{"basename":"sanakirja-core","metadata":576},"old":[{"basename":"sanakirja-core","metadata":576}],"up":[{"change":1,"pos":0}],"down":[{"change":6,"pos":17}],"show_perms":false}},{"Edit":{"inode":{"change":6,"pos":91},"path":"sanakirja-core/src/lib.rs","line":59,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":212}],"down_context":[{"change":6,"pos":1363}],"flag":"BLOCK","start":26,"end":323,"inode":{"change":6,"pos":91}}},"contents":[{"Add":" /// If this value is an offset to another page at offset `offset`,"},{"Add":" /// return `Some(offset)`. Return `None` else."},{"Add":" fn drop(&self, txn: &mut T) -> Result<(), T::Error> {"},{"Add":" for p in self.page_references() {"},{"Add":" txn.decr_rc(p)?;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""}]}},{"Replacement":{"inode":{"change":6,"pos":2014},"path":"sanakirja-core/src/btree/page_unsized.rs","line":214,"ins":{"up_context":[{"change":6,"pos":7142}],"down_context":[{"change":6,"pos":7804}],"flag":"BLOCK","start":324,"end":1204,"inode":{"change":6,"pos":2014}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":7142},"to":{"change":6,"start":7142,"end":7804},"introduced_by":6}],"inode":{"change":6,"pos":2014}},"ins_contents":[{"Add":" lookup_leaf(txn, page, k0, v0, hdr)"},{"Add":" } else {"},{"Add":" lookup_internal(txn, page, k0, v0, hdr)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"unsafe fn lookup_internal("},{"Add":" txn: &T,"},{"Add":" page: crate::Page,"},{"Add":" k0: &K,"},{"Add":" v0: Option<&V>,"},{"Add":" hdr: &header::Header,"},{"Add":") -> Result {"},{"Add":" let s = core::slice::from_raw_parts("},{"Add":" page.data.as_ptr().add(HDR) as *const u64,"},{"Add":" hdr.n() as usize,"},{"Add":" );"},{"Add":" if let Some(v0) = v0 {"},{"Add":" s.binary_search_by(|&off| {"},{"Add":" let off = u64::from_le(off) & 0xfff;"},{"Add":" let (k, v) = read::(txn, page.data.as_ptr().offset(off as isize & 0xfff));"},{"Add":" let k = K::from_raw_ptr(txn, k);"},{"Add":" match k.compare(txn, k0) {"},{"Add":" Ordering::Equal => {"},{"Add":" let v = V::from_raw_ptr(txn, v);"},{"Add":" v.compare(txn, v0)"}],"del_contents":[{"Del":" let s = core::slice::from_raw_parts(\n page.data.as_ptr().add(HDR) as *const u16,\n hdr.n() as usize,\n );\n if let Some(v0) = v0 {\n s.binary_search_by(|&off| {\n let off = u16::from_le(off);\n let (k, v) = read::(txn, page.data.as_ptr().offset(off as isize));\n let k = K::from_raw_ptr(txn, k as *const u8);\n match k.compare(txn, k0) {\n Ordering::Equal => {\n let v = V::from_raw_ptr(txn, v as *const u8);\n v.compare(txn, v0)\n }\n cmp => cmp,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":2014},"path":"sanakirja-core/src/btree/page_unsized.rs","line":241,"ins":{"up_context":[{"change":6,"pos":7822}],"down_context":[{"change":6,"pos":158}],"flag":"BLOCK","start":1205,"end":2084,"inode":{"change":6,"pos":2014}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":7822},"to":{"change":6,"start":7822,"end":8080},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":8080},"to":{"change":6,"start":26,"end":158},"introduced_by":6}],"inode":{"change":6,"pos":2014}},"ins_contents":[{"Add":" cmp => cmp,"},{"Add":" }"},{"Add":" })"},{"Add":" } else {"},{"Add":" match s.binary_search_by(|&off| {"},{"Add":" let off = u64::from_le(off) & 0xfff;"},{"Add":" let (k, _) = read::(txn, page.data.as_ptr().offset(off as isize & 0xfff));"},{"Add":" let k = K::from_raw_ptr(txn, k);"},{"Add":" k.compare(txn, k0)"},{"Add":" }) {"},{"Add":" Err(i) => Err(i),"},{"Add":" Ok(mut i) => {"},{"Add":" // Rewind if there are multiple matching keys."},{"Add":" while i > 0 {"},{"Add":" let off = u64::from_le(s[i-1]) & 0xfff;"},{"Add":" let (k, _) = read::(txn, page.data.as_ptr().offset(off as isize));"},{"Add":" let k = K::from_raw_ptr(txn, k);"},{"Add":" if let Ordering::Equal = k.compare(txn, k0) {"},{"Add":" i -= 1"},{"Add":" } else {"},{"Add":" break"},{"Add":" }"}],"del_contents":[{"Del":" })\n } else {\n s.binary_search_by(|&off| {\n let off = u16::from_le(off);\n let (k, _) = read::(txn, page.data.as_ptr().offset(off as isize));\n let k = K::from_raw_ptr(txn, k);\n"},{"Del":" match k.compare(txn, k0) {\n Ordering::Equal => Ordering::Greater,\n cmp => cmp\n"}]}},{"Replacement":{"inode":{"change":6,"pos":2014},"path":"sanakirja-core/src/btree/page_unsized.rs","line":264,"ins":{"up_context":[{"change":6,"pos":176}],"down_context":[{"change":6,"pos":8130}],"flag":"BLOCK","start":2085,"end":2121,"inode":{"change":6,"pos":2014}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":176},"to":{"change":6,"start":8115,"end":8130},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":8115},"to":{"change":6,"start":8115,"end":8130},"introduced_by":6}],"inode":{"change":6,"pos":2014}},"ins_contents":[{"Add":" Ok(i)"},{"Add":" }"}],"del_contents":[{"Del":" })\n"}]}},{"Edit":{"inode":{"change":6,"pos":2014},"path":"sanakirja-core/src/btree/page_unsized.rs","line":267,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":8140}],"down_context":[{"change":6,"pos":8140}],"flag":"BLOCK","start":2122,"end":2975,"inode":{"change":6,"pos":2014}}},"contents":[{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":""},{"Add":"unsafe fn lookup_leaf("},{"Add":" txn: &T,"},{"Add":" page: crate::Page,"},{"Add":" k0: &K,"},{"Add":" v0: Option<&V>,"},{"Add":" hdr: &header::Header,"},{"Add":") -> Result {"},{"Add":" let s = core::slice::from_raw_parts("},{"Add":" page.data.as_ptr().add(HDR) as *const u16,"},{"Add":" hdr.n() as usize,"},{"Add":" );"},{"Add":" if let Some(v0) = v0 {"},{"Add":" s.binary_search_by(|&off| {"},{"Add":" let off = u16::from_le(off);"},{"Add":" let (k, v) = read::(txn, page.data.as_ptr().offset(off as isize));"},{"Add":" let k = K::from_raw_ptr(txn, k as *const u8);"},{"Add":" match k.compare(txn, k0) {"},{"Add":" Ordering::Equal => {"},{"Add":" let v = V::from_raw_ptr(txn, v as *const u8);"},{"Add":" v.compare(txn, v0)"},{"Add":" }"},{"Add":" cmp => cmp,"},{"Add":" }"},{"Add":" })"}]}},{"Replacement":{"inode":{"change":6,"pos":2014},"path":"sanakirja-core/src/btree/page_unsized.rs","line":296,"ins":{"up_context":[{"change":6,"pos":8153}],"down_context":[{"change":6,"pos":8751}],"flag":"BLOCK","start":2976,"end":3743,"inode":{"change":6,"pos":2014}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":8153},"to":{"change":6,"start":8153,"end":8751},"introduced_by":6}],"inode":{"change":6,"pos":2014}},"ins_contents":[{"Add":" match s.binary_search_by(|&off| {"},{"Add":" let off = u16::from_le(off);"},{"Add":" let (k, _) = read::(txn, page.data.as_ptr().offset(off as isize));"},{"Add":" let k = K::from_raw_ptr(txn, k);"},{"Add":" k.compare(txn, k0)"},{"Add":" }) {"},{"Add":" Err(e) => Err(e),"},{"Add":" Ok(mut i) => {"},{"Add":" // Rewind if there are multiple matching keys."},{"Add":" while i > 0 {"},{"Add":" let off = u16::from_le(s[i-1]);"},{"Add":" let (k, _) = read::(txn, page.data.as_ptr().offset(off as isize));"},{"Add":" let k = K::from_raw_ptr(txn, k);"},{"Add":" if let Ordering::Equal = k.compare(txn, k0) {"},{"Add":" i -= 1"},{"Add":" } else {"},{"Add":" break"}],"del_contents":[{"Del":" let s = core::slice::from_raw_parts(\n page.data.as_ptr().add(HDR) as *const u64,\n hdr.n() as usize,\n );\n if let Some(v0) = v0 {\n s.binary_search_by(|&off| {\n let off = u64::from_le(off) & 0xfff;\n let (k, v) = read::(txn, page.data.as_ptr().offset(off as isize & 0xfff));\n let k = K::from_raw_ptr(txn, k);\n match k.compare(txn, k0) {\n Ordering::Equal => {\n let v = V::from_raw_ptr(txn, v);\n v.compare(txn, v0)\n"}]}},{"Edit":{"inode":{"change":6,"pos":2014},"path":"sanakirja-core/src/btree/page_unsized.rs","line":314,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":8773},"to":{"change":6,"start":8773,"end":9097},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":9097},"to":{"change":6,"start":177,"end":309},"introduced_by":6}],"inode":{"change":6,"pos":2014}}},"contents":[{"Del":" cmp => cmp,\n }\n })\n } else {\n s.binary_search_by(|&off| {\n let off = u64::from_le(off) & 0xfff;\n let (k, _) = read::(txn, page.data.as_ptr().offset(off as isize & 0xfff));\n let k = K::from_raw_ptr(txn, k);\n"},{"Del":" match k.compare(txn, k0) {\n Ordering::Equal => Ordering::Greater,\n cmp => cmp\n"}]}},{"Replacement":{"inode":{"change":6,"pos":2014},"path":"sanakirja-core/src/btree/page_unsized.rs","line":315,"ins":{"up_context":[{"change":6,"pos":327}],"down_context":[{"change":6,"pos":9147}],"flag":"BLOCK","start":3744,"end":3780,"inode":{"change":6,"pos":2014}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":327},"to":{"change":6,"start":9132,"end":9147},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":9132},"to":{"change":6,"start":9132,"end":9147},"introduced_by":6}],"inode":{"change":6,"pos":2014}},"ins_contents":[{"Add":" Ok(i)"},{"Add":" }"}],"del_contents":[{"Del":" })\n"}]}},{"Edit":{"inode":{"change":6,"pos":2014},"path":"sanakirja-core/src/btree/page_unsized.rs","line":321,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":2328}],"down_context":[{"change":6,"pos":2328}],"flag":"BLOCK","start":3781,"end":3782,"inode":{"change":6,"pos":2014}}},"contents":[{"Add":""}]}},{"Replacement":{"inode":{"change":6,"pos":45735},"path":"sanakirja-core/src/btree/mod.rs","line":20,"ins":{"up_context":[{"change":6,"pos":34498}],"down_context":[{"change":6,"pos":34516}],"flag":"BLOCK","start":3783,"end":3816,"inode":{"change":6,"pos":45735}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":34498},"to":{"change":6,"start":34498,"end":34516},"introduced_by":6}],"inode":{"change":6,"pos":45735}},"ins_contents":[{"Add":"pub use del::{del, del_no_decr};"}],"del_contents":[{"Del":"pub use del::del;\n"}]}},{"Edit":{"inode":{"change":6,"pos":45735},"path":"sanakirja-core/src/btree/mod.rs","line":249,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":9230}],"down_context":[{"change":6,"pos":52187}],"flag":"BLOCK","start":3817,"end":4161,"inode":{"change":6,"pos":45735}}},"contents":[{"Add":""},{"Add":"impl + core::fmt::Debug> Storable for Db_ {"},{"Add":" type PageReferences = core::iter::Once;"},{"Add":" fn page_references(&self) -> Self::PageReferences {"},{"Add":" core::iter::once(self.db)"},{"Add":" }"},{"Add":""},{"Add":" fn drop(&self, t: &mut T) -> Result<(), T::Error> {"},{"Add":" drop_(t, self)"},{"Add":" }"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":6,"pos":45735},"path":"sanakirja-core/src/btree/mod.rs","line":312,"ins":{"up_context":[{"change":6,"pos":1589}],"down_context":[{"change":6,"pos":11514}],"flag":"BLOCK","start":4162,"end":6321,"inode":{"change":6,"pos":45735}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1589},"to":{"change":6,"start":1589,"end":1624},"introduced_by":6}],"inode":{"change":6,"pos":45735}},"ins_contents":[{"Add":"/// to `(k, v)` if `v.is_some()`), and return `true` if this entry is"},{"Add":"/// shared with another structure (i.e. the RC of at least one page"},{"Add":"/// along a path to the entry is at least 2)."},{"Add":"pub fn get_shared<'a, T: LoadPage, K: Storable + ?Sized, V: Storable + ?Sized, P: BTreePage>("},{"Add":" txn: &'a T,"},{"Add":" db: &Db_,"},{"Add":" k: &K,"},{"Add":" v: Option<&V>,"},{"Add":") -> Result, T::Error> {"},{"Add":""},{"Add":" // Set the \"cursor stack\" by setting a skip list cursor in"},{"Add":" // each page from the root to the appropriate leaf."},{"Add":" let mut last_match = None;"},{"Add":" let mut page = txn.load_page(db.db)?;"},{"Add":" let mut is_shared = txn.rc(db.db)? >= 2;"},{"Add":" // This is a for loop, to allow the compiler to unroll (maybe)."},{"Add":" for _ in 0..cursor::N_CURSORS {"},{"Add":" let mut cursor = P::cursor_before(&page);"},{"Add":" if let Ok((kk, vv, _)) = P::set_cursor(txn, page.as_page(), &mut cursor, k, v) {"},{"Add":" if v.is_some() {"},{"Add":" return Ok(Some((kk, vv, is_shared)));"},{"Add":" }"},{"Add":" last_match = Some((kk, vv, is_shared));"},{"Add":" } else if let Some((k, v, _)) = P::current(txn, page.as_page(), &cursor) {"},{"Add":" // Here, Rust says that `k` and `v` have the same lifetime"},{"Add":" // as `page`, but we actually know that they're alive for"},{"Add":" // as long as `txn` doesn't change, so we can safely"},{"Add":" // extend their lifetimes:"},{"Add":" unsafe { last_match = Some((core::mem::transmute(k), core::mem::transmute(v), is_shared)) }"},{"Add":" }"},{"Add":" // The cursor is set to the first element greater than or"},{"Add":" // equal to the (k, v) we're looking for, so we need to"},{"Add":" // explore the left subtree."},{"Add":" let next_page = P::left_child(page.as_page(), &cursor);"},{"Add":" if next_page > 0 {"},{"Add":" page = txn.load_page(next_page)?;"},{"Add":" is_shared |= txn.rc(db.db)? >= 2;"},{"Add":" } else {"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(last_match)"},{"Add":"}"},{"Add":""},{"Add":""},{"Add":"/// Get the first entry of a database greater than or equal to `k` (or"},{"Add":"/// to `(k, v)` if `v.is_some()`), and return `true` if this entry is"},{"Add":"/// shared with another structure (i.e. the RC of at least one page"},{"Add":"/// along a path to the entry is at least 2)."}],"del_contents":[{"Del":"/// to `(k, v)` if `v.is_some()`).\n"}]}},{"Edit":{"inode":{"change":6,"pos":45735},"path":"sanakirja-core/src/btree/mod.rs","line":367,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":621}],"down_context":[{"change":6,"pos":621}],"flag":"BLOCK","start":6322,"end":6519,"inode":{"change":6,"pos":45735}}},"contents":[{"Add":""},{"Add":" // Unfortunately, since the above function `get_shared` uses this"},{"Add":" // one in order to get the RC of pages, we can't really refactor,"},{"Add":" // so this is mostly a copy of the other function."},{"Add":""}]}},{"Edit":{"inode":{"change":6,"pos":45735},"path":"sanakirja-core/src/btree/mod.rs","line":409,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":809}],"down_context":[{"change":6,"pos":809}],"flag":"BLOCK","start":6520,"end":6699,"inode":{"change":6,"pos":45735}}},"contents":[{"Add":") -> Result<(), T::Error> {"},{"Add":" drop_(txn, &db)"},{"Add":"}"},{"Add":""},{"Add":"fn drop_>("},{"Add":" txn: &mut T,"},{"Add":" db: &Db_,"}]}},{"Replacement":{"inode":{"change":6,"pos":45735},"path":"sanakirja-core/src/btree/mod.rs","line":475,"ins":{"up_context":[{"change":6,"pos":13429}],"down_context":[{"change":6,"pos":1194}],"flag":"BLOCK","start":6700,"end":6760,"inode":{"change":6,"pos":45735}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":13429},"to":{"change":6,"start":3346,"end":3420},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":3420},"to":{"change":6,"start":2387,"end":2442},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2387},"to":{"change":6,"start":2387,"end":2442},"introduced_by":6}],"inode":{"change":6,"pos":45735}},"ins_contents":[{"Add":" k.drop(txn)?;"},{"Add":" v.drop(txn)?;"}],"del_contents":[{"Del":" for o in k.page_references().chain(v.page_references()) {\n"},{"Del":" txn.decr_rc(o)?;\n }\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":103,"ins":{"up_context":[{"change":6,"pos":7775}],"down_context":[{"change":6,"pos":53700}],"flag":"BLOCK","start":6761,"end":7788,"inode":{"change":6,"pos":52511}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":7775},"to":{"change":6,"start":53660,"end":53700},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":53660},"to":{"change":6,"start":53660,"end":53700},"introduced_by":6}],"inode":{"change":6,"pos":52511}},"ins_contents":[{"Add":" del_at_cursor(txn, db, &mut cursor, true)"},{"Add":"}"},{"Add":""},{"Add":""},{"Add":"/// If `value` is `None`, delete the first entry for `key` from the"},{"Add":"/// database, if present. Else, delete the entry for `(key, value)`,"},{"Add":"/// if present."},{"Add":"pub fn del_no_decr<"},{"Add":" T: AllocPage + LoadPage,"},{"Add":" K: Storable + ?Sized + PartialEq,"},{"Add":" V: Storable + ?Sized + PartialEq,"},{"Add":" P: BTreeMutPage,"},{"Add":">("},{"Add":" txn: &mut T,"},{"Add":" db: &mut Db_,"},{"Add":" key: &K,"},{"Add":" value: Option<&V>,"},{"Add":") -> Result {"},{"Add":" let mut cursor = Cursor::new(txn, db)?;"},{"Add":" // If the key and value weren't found, return."},{"Add":" match (cursor.set(txn, key, value)?, value) {"},{"Add":" (Some((k, v)), Some(value)) if k == key && v == value => {}"},{"Add":" (Some((k, _)), None) if k == key => {}"},{"Add":" _ => return Ok(false),"},{"Add":" }"},{"Add":" // Else, the cursor is set on `(key, value)` if `value.is_some()`"},{"Add":" // or on the first entry with key `key` else."},{"Add":" //"},{"Add":" // We delete that position, which might be in a leaf or in an"},{"Add":" // internal node."},{"Add":" del_at_cursor(txn, db, &mut cursor, false)"}],"del_contents":[{"Del":" del_at_cursor(txn, db, &mut cursor)\n"}]}},{"Edit":{"inode":{"change":6,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":148,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":16194}],"down_context":[{"change":6,"pos":53939}],"flag":"BLOCK","start":7789,"end":7812,"inode":{"change":6,"pos":52511}}},"contents":[{"Add":" decr_del_rc: bool,"}]}},{"Replacement":{"inode":{"change":6,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":160,"ins":{"up_context":[{"change":6,"pos":7959}],"down_context":[{"change":6,"pos":9636}],"flag":"BLOCK","start":7813,"end":8071,"inode":{"change":6,"pos":52511}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":7959},"to":{"change":6,"start":37433,"end":37469},"introduced_by":6}],"inode":{"change":6,"pos":52511}},"ins_contents":[{"Add":" //"},{"Add":" // Note in particular that if p0 == cursor.first_rc_len(), then we"},{"Add":" // don't need to touch the RC, since we're cloning this page, but"},{"Add":" // without including a reference to the deleted entry."},{"Add":" if decr_del_rc && p0 < cursor.first_rc_len() {"}],"del_contents":[{"Del":" if p0 < cursor.first_rc_len() {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":169,"ins":{"up_context":[{"change":6,"pos":1194}],"down_context":[{"change":6,"pos":16763}],"flag":"BLOCK","start":8072,"end":8122,"inode":{"change":6,"pos":52511}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1194},"to":{"change":6,"start":3421,"end":3493},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":3493},"to":{"change":6,"start":450,"end":479},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1260},"to":{"change":6,"start":450,"end":479},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":479},"to":{"change":6,"start":16753,"end":16763},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1289},"to":{"change":6,"start":16753,"end":16763},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":16753},"to":{"change":6,"start":16753,"end":16763},"introduced_by":6}],"inode":{"change":6,"pos":52511}},"ins_contents":[{"Add":" delk.drop(txn)?;"},{"Add":" delv.drop(txn)?;"}],"del_contents":[{"Del":" for o in delk.page_references().chain(delv.page_references()) {\n"},{"Del":" txn.decr_rc(o)?;\n"},{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":6,"pos":70777},"path":"sanakirja-core/Cargo.toml","line":3,"ins":{"up_context":[{"change":6,"pos":70812}],"down_context":[{"change":6,"pos":70847}],"flag":"BLOCK","start":8123,"end":8142,"inode":{"change":6,"pos":70777}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":70812},"to":{"change":5,"start":26,"end":45},"introduced_by":5}],"inode":{"change":6,"pos":70777}},"ins_contents":[{"Add":"version = \"1.2.16\""}],"del_contents":[{"Del":"version = \"1.2.14\"\n"}]}},{"FileMove":{"meta":{"basename":"sanakirja","metadata":576},"old":[{"basename":"sanakirja","metadata":576}],"up":[{"change":1,"pos":0}],"down":[{"change":6,"pos":71001}],"show_perms":false}},{"Edit":{"inode":{"change":6,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":48,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":586}],"down_context":[{"change":6,"pos":2818}],"flag":"BLOCK","start":8164,"end":8266,"inode":{"change":6,"pos":80166}}},"contents":[{"Add":""},{"Add":" /// Offsets of pages free at the start of the transaction."},{"Add":" initial_free: (usize, Vec),"},{"Add":""}]}},{"Replacement":{"inode":{"change":6,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":56,"ins":{"up_context":[{"change":3,"pos":39}],"down_context":[{"change":3,"pos":119}],"flag":"BLOCK","start":8267,"end":8357,"inode":{"change":6,"pos":80166}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":39},"to":{"change":3,"start":39,"end":119},"introduced_by":3}],"inode":{"change":6,"pos":80166}},"ins_contents":[{"Add":" /// Borrow env"},{"Add":" pub fn env_borrow(&self) -> &Env {"},{"Add":" self.env.borrow()"},{"Add":" }"}],"del_contents":[{"Del":" /// Borrow env\n pub fn env_borrow(&self) -> &Env {\n self.env.borrow()\n }\n"}]}},{"Edit":{"inode":{"change":6,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":97,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":602}],"down_context":[{"change":6,"pos":81773}],"flag":"BLOCK","start":8358,"end":8411,"inode":{"change":6,"pos":80166}}},"contents":[{"Add":" parent.initial_free.0 = self.initial_free.0;"}]}},{"Replacement":{"inode":{"change":6,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":183,"ins":{"up_context":[{"change":6,"pos":10473}],"down_context":[{"change":6,"pos":83562}],"flag":"BLOCK","start":8412,"end":8448,"inode":{"change":6,"pos":80166}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":10473},"to":{"change":6,"start":83538,"end":83562},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":83538},"to":{"change":6,"start":83538,"end":83562},"introduced_by":6}],"inode":{"change":6,"pos":80166}},"ins_contents":[{"Add":""},{"Add":" let mut txn = MutTxn {"}],"del_contents":[{"Del":" Ok(MutTxn {\n"}]}},{"Edit":{"inode":{"change":6,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":202,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":83993}],"down_context":[{"change":6,"pos":3330}],"flag":"BLOCK","start":8449,"end":8496,"inode":{"change":6,"pos":80166}}},"contents":[{"Add":" initial_free: (0, Vec::new()),"}]}},{"Replacement":{"inode":{"change":6,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":204,"ins":{"up_context":[{"change":6,"pos":3365}],"down_context":[{"change":6,"pos":84041}],"flag":"BLOCK","start":8497,"end":8911,"inode":{"change":6,"pos":80166}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":3365},"to":{"change":6,"start":84026,"end":84041},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":84026},"to":{"change":6,"start":84026,"end":84041},"introduced_by":6}],"inode":{"change":6,"pos":80166}},"ins_contents":[{"Add":" };"},{"Add":" if txn.free > 0 {"},{"Add":" let free_db: btree::Db = btree::Db::from_page(txn.free);"},{"Add":" let mut init = Vec::new();"},{"Add":" for p in btree::rev_iter(&txn, &free_db, None)? {"},{"Add":" let (p, _) = p?;"},{"Add":" init.push(*p)"},{"Add":" }"},{"Add":" txn.initial_free = (init.len(), init)"},{"Add":" }"},{"Add":""},{"Add":" Ok(txn)"}],"del_contents":[{"Del":" })\n"}]}},{"Replacement":{"inode":{"change":6,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":247,"ins":{"up_context":[{"change":6,"pos":11529}],"down_context":[{"change":6,"pos":11580}],"flag":"BLOCK","start":8912,"end":9685,"inode":{"change":6,"pos":80166}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":11529},"to":{"change":6,"start":11529,"end":11580},"introduced_by":6}],"inode":{"change":6,"pos":80166}},"ins_contents":[{"Add":" debug!(\"free_db = {:x}\", free_db.db);"},{"Add":" {"},{"Add":" for p in btree::iter(&self, &free_db, None).unwrap() {"},{"Add":" debug!(\"was free: p = {:x}\", p.unwrap().0);"},{"Add":" }"},{"Add":" for p in self.free_pages.iter().chain(self.free_owned_pages.iter()) {"},{"Add":" debug!(\"free_pages {:x}\", p);"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" // Deleting the pages allocated during this transaction."},{"Add":" let mut f = self.initial_free.1.len();"},{"Add":" while f > self.initial_free.0 {"},{"Add":" f -= 1;"},{"Add":" let p = self.initial_free.1[f];"},{"Add":" btree::del(&mut self, &mut free_db, &p.to_le(), None)?;"},{"Add":" }"},{"Add":""}],"del_contents":[{"Del":" debug!(\"free_db = {:?}\", free_db);\n"}]}},{"Edit":{"inode":{"change":6,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":269,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":11879},"to":{"change":6,"start":11879,"end":12459},"introduced_by":6}],"inode":{"change":6,"pos":80166}}},"contents":[{"Del":"\n // First, set the free table to 0 in this transaction, to\n // avoid recursing in the calls to `put` below (indeed,\n // the table of free pages is used when allocating new\n // pages, which may happen in a call to `put`).\n self.free = 0;\n\n // Then, while there are pages to free, free them. Since\n // the calls to `put` below might free pages (and add\n // pages to these two vectors), the (outer) loop might run\n // for more than one iteration.\n"}]}},{"Edit":{"inode":{"change":6,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":293,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":13621}],"down_context":[{"change":6,"pos":85146}],"flag":"BLOCK","start":9686,"end":9903,"inode":{"change":6,"pos":80166}}},"contents":[{"Add":" }"},{"Add":" unsafe {"},{"Add":" debug!("},{"Add":" \"commit page {:x}: {:?}\","},{"Add":" p.0.offset,"},{"Add":" std::slice::from_raw_parts(p.0.data, 32)"},{"Add":" );"}]}},{"Edit":{"inode":{"change":6,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":333,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":14477},"to":{"change":6,"start":14477,"end":14575},"introduced_by":6}],"inode":{"change":6,"pos":80166}}},"contents":[{"Del":" debug!(\"root_db: {:?}\", rr);\n debug!(\"committing root: {:?} {:?}\", r, rr);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":408,"ins":{"up_context":[{"change":6,"pos":16496}],"down_context":[{"change":6,"pos":16802}],"flag":"BLOCK","start":9904,"end":10044,"inode":{"change":6,"pos":80166}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":16496},"to":{"change":6,"start":16213,"end":16241},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":86463},"to":{"change":6,"start":16213,"end":16241},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":16241},"to":{"change":6,"start":16497,"end":16534},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":16241},"to":{"change":6,"start":86498,"end":86537},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":16534},"to":{"change":6,"start":86498,"end":86537},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":86498},"to":{"change":6,"start":86498,"end":86537},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":86537},"to":{"change":6,"start":16535,"end":16609},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":16609},"to":{"change":6,"start":16242,"end":16305},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":86708},"to":{"change":6,"start":16242,"end":16305},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":16305},"to":{"change":6,"start":19767,"end":19859},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":16676},"to":{"change":6,"start":86826,"end":86898},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":19859},"to":{"change":6,"start":86826,"end":86898},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":86826},"to":{"change":6,"start":86826,"end":86898},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":86898},"to":{"change":6,"start":16677,"end":16802},"introduced_by":6}],"inode":{"change":6,"pos":80166}},"ins_contents":[{"Add":" while self.initial_free.0 > 0 {"},{"Add":" self.initial_free.0 -= 1;"},{"Add":" let f = self.initial_free.1[self.initial_free.0];"}],"del_contents":[{"Del":" if self.free == 0 {\n"},{"Del":" debug!(\"self.free = 0\");\n"},{"Del":" return Ok(None);\n }\n"},{"Del":" let mut db: btree::Db = btree::Db::from_page(self.free);\n"},{"Del":" let mut curs = btree::cursor::Cursor::new(self, &db)?;\n"},{"Del":" curs.set_last(self)?;\n let mut f = if let Some((f, ())) = curs.prev(self)? {\n"},{"Del":" *f\n } else {\n return Ok(None);\n };\n"},{"Del":" // Get the last page that is also free in all other versions.\n loop {\n debug!(\"trying 0x{:x}\", f);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":412,"ins":{"up_context":[{"change":6,"pos":16841}],"down_context":[{"change":6,"pos":17049}],"flag":"BLOCK","start":10045,"end":10081,"inode":{"change":6,"pos":80166}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":16841},"to":{"change":6,"start":16841,"end":17049},"introduced_by":6}],"inode":{"change":6,"pos":80166}},"ins_contents":[{"Add":" return Ok(Some(f));"}],"del_contents":[{"Del":" break;\n } else if let Some((f_, ())) = curs.prev(self)? {\n f = *f_\n } else {\n debug!(\"no more candidate\");\n return Ok(None);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":415,"ins":{"up_context":[{"change":6,"pos":17073}],"down_context":[{"change":6,"pos":87002}],"flag":"BLOCK","start":10082,"end":10099,"inode":{"change":6,"pos":80166}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":17073},"to":{"change":6,"start":17073,"end":17097},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":17097},"to":{"change":6,"start":19860,"end":19921},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":19921},"to":{"change":6,"start":86955,"end":87002},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":42064},"to":{"change":6,"start":86955,"end":87002},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":86955},"to":{"change":6,"start":86955,"end":87002},"introduced_by":6}],"inode":{"change":6,"pos":80166}},"ins_contents":[{"Add":" Ok(None)"}],"del_contents":[{"Del":"\n self.free = 0;\n"},{"Del":" assert!(btree::del::del(self, &mut db, &f, None)?);\n\n"},{"Del":" self.free = db.db;\n Ok(Some(f))\n"}]}},{"Replacement":{"inode":{"change":6,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":505,"ins":{"up_context":[{"change":6,"pos":1789}],"down_context":[{"change":6,"pos":89113}],"flag":"BLOCK","start":10100,"end":10177,"inode":{"change":6,"pos":80166}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1789},"to":{"change":6,"start":19104,"end":19175},"introduced_by":6}],"inode":{"change":6,"pos":80166}},"ins_contents":[{"Add":" btree::del::del_at_cursor(self, &mut rc_, &mut curs, true)?;"}],"del_contents":[{"Del":" btree::del::del_at_cursor(self, &mut rc_, &mut curs)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":507,"ins":{"up_context":[{"change":6,"pos":89127}],"down_context":[{"change":6,"pos":19176}],"flag":"BLOCK","start":10178,"end":10234,"inode":{"change":6,"pos":80166}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":89127},"to":{"change":6,"start":2424,"end":2478},"introduced_by":6}],"inode":{"change":6,"pos":80166}},"ins_contents":[{"Add":" debug!(\"incr rc 0x{:x} {:?}\", off, rc + 1);"}],"del_contents":[{"Del":" debug!(\"incr rc 0x{:x} {:?}\", off, rc+1);\n"}]}},{"Edit":{"inode":{"change":6,"pos":11},"path":"sanakirja/src/debug.rs","line":123,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":3066}],"down_context":[{"change":6,"pos":2063}],"flag":"BLOCK","start":10235,"end":10499,"inode":{"change":6,"pos":11}}},"contents":[{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub trait Check: core::fmt::Debug {"},{"Add":" fn add_refs("},{"Add":" &self,"},{"Add":" _txn: &T,"},{"Add":" _refs: &mut std::collections::BTreeMap,"},{"Add":" ) -> Result<(), T::Error>"},{"Add":" where"},{"Add":" T::Error: std::fmt::Debug,"},{"Add":" {"},{"Add":" Ok(())"}]}},{"Edit":{"inode":{"change":6,"pos":11},"path":"sanakirja/src/debug.rs","line":138,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":2071}],"down_context":[{"change":6,"pos":2071}],"flag":"BLOCK","start":10500,"end":10544,"inode":{"change":6,"pos":11}}},"contents":[{"Add":""},{"Add":"impl Check for u64 {}"},{"Add":"impl Check for () {}"}]}},{"Edit":{"inode":{"change":6,"pos":11},"path":"sanakirja/src/debug.rs","line":142,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":2072}],"down_context":[{"change":6,"pos":2072}],"flag":"BLOCK","start":10545,"end":12484,"inode":{"change":6,"pos":11}}},"contents":[{"Add":"impl + std::fmt::Debug> Check"},{"Add":" for Db_"},{"Add":"{"},{"Add":" fn add_refs("},{"Add":" &self,"},{"Add":" txn: &T,"},{"Add":" pages: &mut std::collections::BTreeMap,"},{"Add":" ) -> Result<(), T::Error>"},{"Add":" where"},{"Add":" T::Error: std::fmt::Debug,"},{"Add":" {"},{"Add":" use std::collections::btree_map::Entry;"},{"Add":" let mut stack = vec![self.db];"},{"Add":" while let Some(p) = stack.pop() {"},{"Add":" match pages.entry(p) {"},{"Add":" Entry::Vacant(e) => {"},{"Add":" debug!(\"add_refs: 0x{:x}\", p);"},{"Add":" e.insert(1);"},{"Add":" let p = txn.load_page(p)?;"},{"Add":" let mut c = P::cursor_first(&p);"},{"Add":" let l = P::left_child(p.as_page(), &c);"},{"Add":" if l > 0 {"},{"Add":" stack.push(l);"},{"Add":" }"},{"Add":" let mut kv = None;"},{"Add":" while let Some((k, v, r)) = P::next(txn, p.as_page(), &mut c) {"},{"Add":" debug!(\"{:?} {:?} {:?}\", k, v, kv);"},{"Add":" if let Some((k_, v_)) = kv {"},{"Add":" debug!(\"{:?} {:?} {:?}\", k_ > k, k_ == k, v_ > v);"},{"Add":" if k_ > k || (k_ == k && v_ > v) {"},{"Add":" debug(txn, &[self], \"debug_ord\", true);"},{"Add":" panic!(\"{:?} {:?} {:?} {:?} {:?}\", kv, k_, v_, k_ > k, v_ > v);"},{"Add":" }"},{"Add":" }"},{"Add":" k.add_refs(txn, pages)?;"},{"Add":" v.add_refs(txn, pages)?;"},{"Add":" kv = Some((k, v));"},{"Add":" if r > 0 {"},{"Add":" stack.push(r);"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Entry::Occupied(mut e) => {"},{"Add":" e.insert(e.get() + 1);"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""}]}},{"Edit":{"inode":{"change":6,"pos":11},"path":"sanakirja/src/debug.rs","line":269,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4345},"to":{"change":6,"start":4345,"end":4354},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4354},"to":{"change":6,"start":85,"end":227},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":227},"to":{"change":6,"start":4448,"end":4540},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4448},"to":{"change":6,"start":4448,"end":4540},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4540},"to":{"change":6,"start":228,"end":292},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":292},"to":{"change":6,"start":4568,"end":5034},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4568},"to":{"change":6,"start":4568,"end":5034},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5034},"to":{"change":6,"start":293,"end":937},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":937},"to":{"change":6,"start":5118,"end":5314},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5118},"to":{"change":6,"start":5118,"end":5314},"introduced_by":6}],"inode":{"change":6,"pos":11}}},"contents":[{"Del":" }\n}\n\n"},{"Del":"pub fn add_refs>(\n"},{"Del":" txn: &T,\n db: &Db_,\n pages: &mut std::collections::BTreeMap,\n"},{"Del":") -> Result<(), T::Error>\nwhere\n T::Error: std::fmt::Debug\n{\n"},{"Del":" use std::collections::btree_map::Entry;\n let mut stack = vec![db.db];\n while let Some(p) = stack.pop() {\n match pages.entry(p) {\n Entry::Vacant(e) => {\n debug!(\"add_refs: 0x{:x}\", p);\n e.insert(1);\n let p = txn.load_page(p)?;\n let mut c = P::cursor_first(&p);\n let l = P::left_child(p.as_page(), &c);\n if l > 0 {\n stack.push(l);\n"},{"Del":" }\n let mut kv = None;\n while let Some((k, v, r)) = P::next(txn, p.as_page(), &mut c) {\n debug!(\"{:?} {:?} {:?}\", k, v, kv);\n if let Some((k_, v_)) = kv {\n debug!(\"{:?} {:?} {:?}\", k_ > k, k_ == k, v_ > v);\n if k_ > k || (k_ == k && v_ > v) {\n debug(txn, &[db], \"debug_ord\", true);\n panic!(\"{:?} {:?} {:?} {:?} {:?}\", kv, k_, v_, k_>k, v_>v);\n }\n }\n kv = Some((k, v));\n if r > 0 {\n"},{"Del":" stack.push(r);\n }\n }\n }\n Entry::Occupied(mut e) => {\n e.insert(e.get() + 1);\n }\n }\n"}]}},{"Edit":{"inode":{"change":6,"pos":11},"path":"sanakirja/src/debug.rs","line":270,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3072},"to":{"change":6,"start":5315,"end":5326},"introduced_by":6}],"inode":{"change":6,"pos":11}}},"contents":[{"Del":" Ok(())\n"}]}},{"Replacement":{"inode":{"change":6,"pos":11},"path":"sanakirja/src/debug.rs","line":283,"ins":{"up_context":[{"change":6,"pos":5833}],"down_context":[{"change":6,"pos":5878}],"flag":"BLOCK","start":12485,"end":12528,"inode":{"change":6,"pos":11}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5833},"to":{"change":6,"start":5833,"end":5878},"introduced_by":6}],"inode":{"change":6,"pos":11}},"ins_contents":[{"Add":" free_db.add_refs(txn, pages)?;"}],"del_contents":[{"Del":" add_refs(txn, &free_db, pages)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":11},"path":"sanakirja/src/debug.rs","line":288,"ins":{"up_context":[{"change":6,"pos":6041}],"down_context":[{"change":6,"pos":6084}],"flag":"BLOCK","start":12529,"end":12570,"inode":{"change":6,"pos":11}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6041},"to":{"change":6,"start":6041,"end":6084},"introduced_by":6}],"inode":{"change":6,"pos":11}},"ins_contents":[{"Add":" rc_db.add_refs(txn, pages)?;"}],"del_contents":[{"Del":" add_refs(txn, &rc_db, pages)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":11},"path":"sanakirja/src/debug.rs","line":301,"ins":{"up_context":[{"change":6,"pos":1884}],"down_context":[{"change":6,"pos":1925}],"flag":"BLOCK","start":12571,"end":12610,"inode":{"change":6,"pos":11}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1884},"to":{"change":6,"start":1884,"end":1925},"introduced_by":6}],"inode":{"change":6,"pos":11}},"ins_contents":[{"Add":" free_db.add_refs(txn, pages)?;"}],"del_contents":[{"Del":" add_refs(txn, &free_db, pages)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":11},"path":"sanakirja/src/debug.rs","line":305,"ins":{"up_context":[{"change":6,"pos":2019}],"down_context":[{"change":6,"pos":2055}],"flag":"BLOCK","start":12611,"end":12645,"inode":{"change":6,"pos":11}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2019},"to":{"change":6,"start":2019,"end":2055},"introduced_by":6}],"inode":{"change":6,"pos":11}},"ins_contents":[{"Add":" rc.add_refs(txn, pages)?;"}],"del_contents":[{"Del":" add_refs(txn, &rc, pages)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":11},"path":"sanakirja/src/debug.rs","line":310,"ins":{"up_context":[{"change":4,"pos":6263}],"down_context":[{"change":4,"pos":6396}],"flag":"BLOCK","start":12646,"end":12790,"inode":{"change":6,"pos":11}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":6263},"to":{"change":4,"start":6263,"end":6396},"introduced_by":4}],"inode":{"change":6,"pos":11}},"ins_contents":[{"Add":"pub fn check_refs, T>("},{"Add":" txn: &crate::MutTxn,"},{"Add":" refs: &std::collections::BTreeMap,"},{"Add":") {"}],"del_contents":[{"Del":"pub fn check_refs, T>(txn: &crate::MutTxn, refs: &std::collections::BTreeMap) {\n"}]}},{"FileMove":{"meta":{"basename":"cover","metadata":64},"old":[{"basename":"cover","metadata":64}],"up":[{"change":1,"pos":0}],"down":[{"change":6,"pos":8}],"show_perms":false}},{"FileMove":{"meta":{"basename":"Cargo.toml","metadata":0},"old":[{"basename":"Cargo.toml","metadata":0}],"up":[{"change":1,"pos":0}],"down":[{"change":6,"pos":108835}],"show_perms":false}}],"owner":"pijul","repo":"sanakirja","token":"PddfzRPRQrqvuIwaXSwcMsvMXZKcJBdtjmR00/LZHkE=","login":null}

…

Dependencies

Change contents