{"header":{"message":"Improving safety of cursors","description":null,"timestamp":"2021-02-04T10:00:53.20753678Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"W26CFMAQOXMUK4ZOJMAN4SMBXMWFQHO7HCTEVW73FQSRMJZFGJIQC","authors":[],"deps":{"hashes":[["W26CFMAQOXMUK4ZOJMAN4SMBXMWFQHO7HCTEVW73FQSRMJZFGJIQC","Improving safety of cursors"],["AA",null],["APPY2E7M5NHNC6MFYXSVEKJVAILK7YAZVTVE3W75EK2JNFVS3XBQC","Unsized deletions + custom sizes back"],["AOX2XQISHGWNNAFBYRN44Q6AWG7H5DPBK5YMFHK42HQNZ2TMHEJQC","Actually, with the correct functions, Unsized pages are always slower than Sized pages (especially for writing)"],["KMT3MF5NLEQIPZLHCRYDGQ5EA46HJCG3C2ANEPMZGKGHDK77ADPAC","Drop a database"],["6UVFCERMGSGNRWCVC3GWO5HWV6MSWE433DXBJVC7KRPP6LLJLCSQC","Formatting, debugging, etc."],["WS4ZQM4RMIHZ6XZKSDQJGHN5SSSWFL4H236USOPUA33S6RC53RFAC","Debugging, tests, etc."],["EAAYH6BQWDK52EC5RG3BEZQU3FJPN5RRRN4U5KDKDVPKXBVJMNDAC","Debugging put"],["6DMPXOAT5GQ3BQQOMUZN2GMBQPRA4IB7CCPHTQTIFGO3KWWAKF3QC","More debugging"],["ONES3V466GLO5CXKRF5ENK7VFOQPWM3YXLVRGWB56V5SH3W7XNBQC","reference counting works for put"],["S4V4QZ5CF5LUDYWNR2UMWH6CHJDJ5FPGAZCQYM5GY7FJMJV4NN4QC","Debugging reference-counting for put"],["FMN7X4J24EYPOJNBUWM4NKGWSJTRV2DHCIBMPV2AXLZVVAMNOBKQC","Micro-improvements, now noticeably faster than std::collections::BTreeMap"],["X3QVVQIS7B7L3XYZAWL3OOBUXOJ6RMOKQ45YMLLGAHYPEEKZ45ZAC","More debugging (del seems to work now)"],["DV4A2LR7Q5LAEGAQHLO34PZCHGJUHPAMRZFGT7GUFNKVQKPJNOYQC","Double-inserts (rebalancing near an internal deletion)"],["OP6SVMOD2GTQ7VNJ4E5KYFG4MIYA7HBMXJTADALMZH4PY7OQRMZQC","Resetting history"],["QEUTVAZ4F4EJXRDMWDMYXF6XEDMX7YPVG4IIXEKPIR3K54E5W5OAC","Splitting btree::page"],["OTWDDJE7TTE73D6BGF4ZN6BH2NFUFLPME2VJ3CPALH463UGWLEIQC","Trait/type cleanup"],["H3FVSQIQGFCFKCPXVOSFHP4OSUOBBURJESCZNGQTNDAAD3WQSBEQC","Unsized pages"]],"deps":["APPY2E7M5NHNC6MFYXSVEKJVAILK7YAZVTVE3W75EK2JNFVS3XBQC","AOX2XQISHGWNNAFBYRN44Q6AWG7H5DPBK5YMFHK42HQNZ2TMHEJQC","KMT3MF5NLEQIPZLHCRYDGQ5EA46HJCG3C2ANEPMZGKGHDK77ADPAC"],"known":["OP6SVMOD2GTQ7VNJ4E5KYFG4MIYA7HBMXJTADALMZH4PY7OQRMZQC","FMN7X4J24EYPOJNBUWM4NKGWSJTRV2DHCIBMPV2AXLZVVAMNOBKQC","WS4ZQM4RMIHZ6XZKSDQJGHN5SSSWFL4H236USOPUA33S6RC53RFAC","EAAYH6BQWDK52EC5RG3BEZQU3FJPN5RRRN4U5KDKDVPKXBVJMNDAC","ONES3V466GLO5CXKRF5ENK7VFOQPWM3YXLVRGWB56V5SH3W7XNBQC","X3QVVQIS7B7L3XYZAWL3OOBUXOJ6RMOKQ45YMLLGAHYPEEKZ45ZAC","DV4A2LR7Q5LAEGAQHLO34PZCHGJUHPAMRZFGT7GUFNKVQKPJNOYQC","QEUTVAZ4F4EJXRDMWDMYXF6XEDMX7YPVG4IIXEKPIR3K54E5W5OAC","6DMPXOAT5GQ3BQQOMUZN2GMBQPRA4IB7CCPHTQTIFGO3KWWAKF3QC","S4V4QZ5CF5LUDYWNR2UMWH6CHJDJ5FPGAZCQYM5GY7FJMJV4NN4QC","OTWDDJE7TTE73D6BGF4ZN6BH2NFUFLPME2VJ3CPALH463UGWLEIQC","H3FVSQIQGFCFKCPXVOSFHP4OSUOBBURJESCZNGQTNDAAD3WQSBEQC","6UVFCERMGSGNRWCVC3GWO5HWV6MSWE433DXBJVC7KRPP6LLJLCSQC"]},"hunks":[{"Replacement":{"inode":{"change":5,"pos":3448},"path":"sanakirja-core/src/btree/put.rs","line":37,"ins":{"up_context":[{"change":5,"pos":4538}],"down_context":[{"change":5,"pos":4587}],"flag":"BLOCK","start":0,"end":50,"inode":{"change":5,"pos":3448}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":4538},"to":{"change":5,"start":70,"end":118},"introduced_by":5}],"inode":{"change":5,"pos":3448}},"ins_contents":[{"Add":" cursor.pointer() < cursor.first_rc_level,"}],"del_contents":[{"Del":" cursor.pointer < cursor.first_rc_level,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":3448},"path":"sanakirja-core/src/btree/put.rs","line":80,"ins":{"up_context":[{"change":5,"pos":304}],"down_context":[{"change":5,"pos":70}],"flag":"BLOCK","start":51,"end":123,"inode":{"change":5,"pos":3448}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":304},"to":{"change":5,"start":304,"end":341},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":341},"to":{"change":5,"start":30,"end":70},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":5516},"to":{"change":5,"start":30,"end":70},"introduced_by":5}],"inode":{"change":5,"pos":3448}},"ins_contents":[{"Add":" cursor.pop();"},{"Add":" if cursor.pointer() > 0 {"}],"del_contents":[{"Del":" cursor.pointer -= 1;\n"},{"Del":" if cursor.pointer > 0 {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":3448},"path":"sanakirja-core/src/btree/put.rs","line":86,"ins":{"up_context":[{"change":5,"pos":215}],"down_context":[{"change":5,"pos":279}],"flag":"BLOCK","start":124,"end":190,"inode":{"change":5,"pos":3448}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":215},"to":{"change":5,"start":215,"end":279},"introduced_by":5}],"inode":{"change":5,"pos":3448}},"ins_contents":[{"Add":" cursor.pointer() < cursor.first_rc_level,"}],"del_contents":[{"Del":" cursor.pointer < cursor.first_rc_level,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":3448},"path":"sanakirja-core/src/btree/put.rs","line":117,"ins":{"up_context":[{"change":5,"pos":470}],"down_context":[{"change":5,"pos":573}],"flag":"BLOCK","start":191,"end":263,"inode":{"change":5,"pos":3448}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":470},"to":{"change":5,"start":470,"end":507},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":507},"to":{"change":5,"start":533,"end":573},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":7373},"to":{"change":5,"start":533,"end":573},"introduced_by":5}],"inode":{"change":5,"pos":3448}},"ins_contents":[{"Add":" cursor.pop();"},{"Add":" if cursor.pointer() > 0 {"}],"del_contents":[{"Del":" cursor.pointer -= 1;\n"},{"Del":" if cursor.pointer > 0 {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":3448},"path":"sanakirja-core/src/btree/put.rs","line":123,"ins":{"up_context":[{"change":5,"pos":746}],"down_context":[{"change":5,"pos":810}],"flag":"BLOCK","start":264,"end":330,"inode":{"change":5,"pos":3448}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":746},"to":{"change":5,"start":746,"end":810},"introduced_by":5}],"inode":{"change":5,"pos":3448}},"ins_contents":[{"Add":" cursor.pointer() < cursor.first_rc_level,"}],"del_contents":[{"Del":" cursor.pointer < cursor.first_rc_level,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":3448},"path":"sanakirja-core/src/btree/put.rs","line":151,"ins":{"up_context":[{"change":5,"pos":956}],"down_context":[{"change":5,"pos":980}],"flag":"BLOCK","start":331,"end":357,"inode":{"change":5,"pos":3448}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":956},"to":{"change":5,"start":956,"end":980},"introduced_by":5}],"inode":{"change":5,"pos":3448}},"ins_contents":[{"Add":" cursor.pointer(),"}],"del_contents":[{"Del":" cursor.pointer,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":3448},"path":"sanakirja-core/src/btree/put.rs","line":154,"ins":{"up_context":[{"change":5,"pos":1017}],"down_context":[{"change":5,"pos":7748}],"flag":"BLOCK","start":358,"end":408,"inode":{"change":5,"pos":3448}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":651},"to":{"change":5,"start":7700,"end":7748},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1017},"to":{"change":5,"start":7700,"end":7748},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1107},"to":{"change":5,"start":7700,"end":7748},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":7700},"to":{"change":5,"start":7700,"end":7748},"introduced_by":5}],"inode":{"change":5,"pos":3448}},"ins_contents":[{"Add":" if cursor.pointer() < cursor.first_rc_level {"}],"del_contents":[{"Del":" if cursor.pointer < cursor.first_rc_level {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":3448},"path":"sanakirja-core/src/btree/put.rs","line":156,"ins":{"up_context":[{"change":5,"pos":7814}],"down_context":[{"change":5,"pos":7852}],"flag":"BLOCK","start":409,"end":449,"inode":{"change":5,"pos":3448}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":7814},"to":{"change":5,"start":7814,"end":7852},"introduced_by":5}],"inode":{"change":5,"pos":3448}},"ins_contents":[{"Add":" free[cursor.pointer()] = freed;"}],"del_contents":[{"Del":" free[cursor.pointer] = freed;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":3448},"path":"sanakirja-core/src/btree/put.rs","line":161,"ins":{"up_context":[{"change":5,"pos":92}],"down_context":[{"change":5,"pos":7918}],"flag":"BLOCK","start":450,"end":505,"inode":{"change":5,"pos":3448}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":92},"to":{"change":5,"start":652,"end":705},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":7865},"to":{"change":5,"start":652,"end":705},"introduced_by":5}],"inode":{"change":5,"pos":3448}},"ins_contents":[{"Add":" if cursor.pointer() == cursor.first_rc_level {"}],"del_contents":[{"Del":" if cursor.pointer == cursor.first_rc_level {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":3448},"path":"sanakirja-core/src/btree/put.rs","line":163,"ins":{"up_context":[{"change":5,"pos":7958}],"down_context":[{"change":5,"pos":8113}],"flag":"BLOCK","start":506,"end":550,"inode":{"change":5,"pos":3448}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":7958},"to":{"change":5,"start":706,"end":748},"introduced_by":5}],"inode":{"change":5,"pos":3448}},"ins_contents":[{"Add":" free[cursor.pointer()] = freed;"}],"del_contents":[{"Del":" free[cursor.pointer] = freed;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":27023},"path":"sanakirja-core/src/btree/page_unsized/put.rs","line":107,"ins":{"up_context":[{"change":5,"pos":30069}],"down_context":[{"change":5,"pos":30203}],"flag":"BLOCK","start":551,"end":649,"inode":{"change":5,"pos":27023}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":30069},"to":{"change":5,"start":30069,"end":30106},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":30106},"to":{"change":3,"start":192,"end":253},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":253},"to":{"change":5,"start":30168,"end":30203},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":30168},"to":{"change":5,"start":30168,"end":30203},"introduced_by":5}],"inode":{"change":5,"pos":27023}},"ins_contents":[{"Add":" core::slice::from_raw_parts(page.data.as_ptr().add(HDR) as *const L::Offset, n0 as usize)"}],"del_contents":[{"Del":" core::slice::from_raw_parts(\n"},{"Del":" page.data.as_ptr().add(HDR) as *const L::Offset,\n"},{"Del":" n0 as usize,\n )\n"}]}},{"Edit":{"inode":{"change":5,"pos":27023},"path":"sanakirja-core/src/btree/page_unsized/put.rs","line":112,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":30307},"to":{"change":3,"start":254,"end":255},"introduced_by":3}],"inode":{"change":5,"pos":27023}}},"contents":[{"Del":"\n"}]}},{"Replacement":{"inode":{"change":5,"pos":45735},"path":"sanakirja-core/src/btree/mod.rs","line":392,"ins":{"up_context":[{"change":4,"pos":318}],"down_context":[{"change":4,"pos":471}],"flag":"BLOCK","start":650,"end":837,"inode":{"change":5,"pos":45735}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":318},"to":{"change":4,"start":318,"end":471},"introduced_by":4}],"inode":{"change":5,"pos":45735}},"ins_contents":[{"Add":"pub fn drop<"},{"Add":" T: AllocPage,"},{"Add":" K: Representable + ?Sized,"},{"Add":" V: Representable + ?Sized,"},{"Add":" P: BTreePage,"},{"Add":">("},{"Add":" txn: &mut T,"},{"Add":" db: Db_,"},{"Add":") -> Result<(), T::Error> {"}],"del_contents":[{"Del":"pub fn drop>(txn: &mut T, db: Db_) -> Result<(), T::Error> {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":45735},"path":"sanakirja-core/src/btree/mod.rs","line":404,"ins":{"up_context":[{"change":4,"pos":519}],"down_context":[{"change":4,"pos":660}],"flag":"BLOCK","start":838,"end":994,"inode":{"change":5,"pos":45735}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":519},"to":{"change":4,"start":519,"end":660},"introduced_by":4}],"inode":{"change":5,"pos":45735}},"ins_contents":[{"Add":"fn drop_>("},{"Add":" txn: &mut T,"},{"Add":" p: Page,"},{"Add":") -> Result<(), T::Error> {"}],"del_contents":[{"Del":"fn drop_>(txn: &mut T, p: Page) -> Result<(), T::Error> {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":45735},"path":"sanakirja-core/src/btree/mod.rs","line":417,"ins":{"up_context":[{"change":4,"pos":922}],"down_context":[{"change":4,"pos":948}],"flag":"BLOCK","start":995,"end":1022,"inode":{"change":5,"pos":45735}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":922},"to":{"change":4,"start":922,"end":948},"introduced_by":4}],"inode":{"change":5,"pos":45735}},"ins_contents":[{"Add":" return Ok(());"}],"del_contents":[{"Del":" return Ok(())\n"}]}},{"Edit":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":13,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":53046},"to":{"change":5,"start":53046,"end":53074},"introduced_by":5}],"inode":{"change":5,"pos":52511}}},"contents":[{"Del":"use core::mem::MaybeUninit;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":47,"ins":{"up_context":[{"change":5,"pos":53969}],"down_context":[{"change":5,"pos":53998}],"flag":"BLOCK","start":1023,"end":1054,"inode":{"change":5,"pos":52511}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":53969},"to":{"change":5,"start":53969,"end":53998},"introduced_by":5}],"inode":{"change":5,"pos":52511}},"ins_contents":[{"Add":" let p0 = cursor.pointer();"}],"del_contents":[{"Del":" let p0 = cursor.pointer;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":54,"ins":{"up_context":[{"change":5,"pos":16452}],"down_context":[{"change":5,"pos":16469}],"flag":"BLOCK","start":1055,"end":1094,"inode":{"change":5,"pos":52511}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":16452},"to":{"change":5,"start":16452,"end":16469},"introduced_by":5}],"inode":{"change":5,"pos":52511}},"ins_contents":[{"Add":" let (delk, delv, _) = unsafe {"}],"del_contents":[{"Del":" unsafe {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":56,"ins":{"up_context":[{"change":5,"pos":16509}],"down_context":[{"change":5,"pos":16753}],"flag":"BLOCK","start":1095,"end":1289,"inode":{"change":5,"pos":52511}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":16509},"to":{"change":5,"start":16509,"end":16753},"introduced_by":5}],"inode":{"change":5,"pos":52511}},"ins_contents":[{"Add":" P::unchecked_current(txn, cur.page.as_page(), cur.cursor.as_ref().unwrap())"},{"Add":" };"},{"Add":" for o in delk.page_offsets().chain(delv.page_offsets()) {"},{"Add":" txn.incr_rc(o)?;"}],"del_contents":[{"Del":" let (delk, delv, _) =\n P::unchecked_current(txn, cur.page.as_page(), cur.cursor.as_ref().unwrap());\n for o in delk.page_offsets().chain(delv.page_offsets()) {\n txn.incr_rc(o)?;\n }\n"}]}},{"Replacement":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":74,"ins":{"up_context":[{"change":5,"pos":17134}],"down_context":[{"change":5,"pos":17136}],"flag":"BLOCK","start":1290,"end":1341,"inode":{"change":5,"pos":52511}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":17134},"to":{"change":5,"start":55653,"end":55678},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":55653},"to":{"change":5,"start":55653,"end":55678},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":31882},"to":{"change":5,"start":55678,"end":55709},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":55678},"to":{"change":5,"start":55678,"end":55709},"introduced_by":5}],"inode":{"change":5,"pos":52511}},"ins_contents":[{"Add":" cursor.pop();"},{"Add":" while cursor.pointer() > 0 {"}],"del_contents":[{"Del":" cursor.pointer -= 1;\n"},{"Del":" while cursor.pointer > 0 {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":96,"ins":{"up_context":[{"change":2,"pos":2591}],"down_context":[{"change":5,"pos":59591}],"flag":"BLOCK","start":1342,"end":1363,"inode":{"change":5,"pos":52511}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":31108},"to":{"change":5,"start":59562,"end":59591},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":2,"pos":2591},"to":{"change":5,"start":59562,"end":59591},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":5,"pos":17869},"to":{"change":5,"start":59562,"end":59591},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":59562},"to":{"change":5,"start":59562,"end":59591},"introduced_by":5}],"inode":{"change":5,"pos":52511}},"ins_contents":[{"Add":" cursor.pop()"}],"del_contents":[{"Del":" cursor.pointer -= 1;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":140,"ins":{"up_context":[{"change":5,"pos":31480}],"down_context":[{"change":5,"pos":31524}],"flag":"BLOCK","start":1364,"end":1426,"inode":{"change":5,"pos":52511}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":31480},"to":{"change":5,"start":31480,"end":31524},"introduced_by":5}],"inode":{"change":5,"pos":52511}},"ins_contents":[{"Add":" cur.page,"},{"Add":" cursor.pointer(),"},{"Add":" left_page"}],"del_contents":[{"Del":" cur.page, cursor.pointer, left_page\n"}]}},{"Edit":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":145,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":61472},"to":{"change":5,"start":61472,"end":61501},"introduced_by":5}],"inode":{"change":5,"pos":52511}}},"contents":[{"Del":" cursor.pointer += 1;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":148,"ins":{"up_context":[{"change":5,"pos":32574}],"down_context":[{"change":5,"pos":61708}],"flag":"BLOCK","start":1427,"end":1460,"inode":{"change":5,"pos":52511}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":32574},"to":{"change":5,"start":61639,"end":61708},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":61639},"to":{"change":5,"start":61639,"end":61708},"introduced_by":5}],"inode":{"change":5,"pos":52511}},"ins_contents":[{"Add":" cursor.push(PageCursor {"}],"del_contents":[{"Del":" cursor.stack[cursor.pointer] = MaybeUninit::new(PageCursor {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":153,"ins":{"up_context":[{"change":5,"pos":61776}],"down_context":[{"change":5,"pos":61776}],"flag":"BLOCK","start":1461,"end":1526,"inode":{"change":5,"pos":52511}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":61776},"to":{"change":5,"start":8628,"end":8691},"introduced_by":5}],"inode":{"change":5,"pos":52511}},"ins_contents":[{"Add":" debug!(\"find_min: cursor.pointer = {:?}\", cursor.pointer());"}],"del_contents":[{"Del":" debug!(\"find_min: cursor.pointer = {:?}\", cursor.pointer);\n"}]}},{"Replacement":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":168,"ins":{"up_context":[{"change":2,"pos":2827}],"down_context":[{"change":5,"pos":31983}],"flag":"BLOCK","start":1527,"end":1674,"inode":{"change":5,"pos":52511}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":2827},"to":{"change":5,"start":18598,"end":18674},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":18598},"to":{"change":5,"start":18598,"end":18674},"introduced_by":5}],"inode":{"change":5,"pos":52511}},"ins_contents":[{"Add":" let is_rc = cursor.pointer() >= cursor.first_rc_level;"},{"Add":" let del_at_internal = p0 < cursor.pointer();"},{"Add":" let ref mut curs0 = cursor.last();"}],"del_contents":[{"Del":" let curs0 = unsafe { &mut *cursor.stack[cursor.pointer].as_mut_ptr() };\n"}]}},{"Replacement":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":172,"ins":{"up_context":[{"change":5,"pos":32069}],"down_context":[{"change":5,"pos":32269}],"flag":"BLOCK","start":1675,"end":1690,"inode":{"change":5,"pos":52511}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":32220},"to":{"change":5,"start":32220,"end":32269},"introduced_by":5}],"inode":{"change":5,"pos":52511}},"ins_contents":[{"Add":" if is_rc {"}],"del_contents":[{"Del":" if cursor.pointer >= cursor.first_rc_level {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":185,"ins":{"up_context":[{"change":5,"pos":18853}],"down_context":[{"change":5,"pos":32819}],"flag":"BLOCK","start":1691,"end":1716,"inode":{"change":5,"pos":52511}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":18853},"to":{"change":5,"start":32790,"end":32819},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":32790},"to":{"change":5,"start":32790,"end":32819},"introduced_by":5}],"inode":{"change":5,"pos":52511}},"ins_contents":[{"Add":" if del_at_internal {"}],"del_contents":[{"Del":" if p0 < cursor.pointer {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":187,"ins":{"up_context":[{"change":5,"pos":32866}],"down_context":[{"change":5,"pos":33148}],"flag":"BLOCK","start":1717,"end":1930,"inode":{"change":5,"pos":52511}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":32866},"to":{"change":5,"start":32866,"end":32883},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":32883},"to":{"change":5,"start":18854,"end":18936},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":18936},"to":{"change":5,"start":32960,"end":33148},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":32960},"to":{"change":5,"start":32960,"end":33148},"introduced_by":5}],"inode":{"change":5,"pos":52511}},"ins_contents":[{"Add":" let (k, v, _) = unsafe { P::unchecked_current(txn, curs0.page.as_page(), &c0) };"},{"Add":" if is_rc {"},{"Add":" for o in (&*k).page_offsets().chain((&*v).page_offsets()) {"},{"Add":" txn.incr_rc(o)?;"}],"del_contents":[{"Del":" unsafe {\n"},{"Del":" let (k, v, _) = P::unchecked_current(txn, curs0.page.as_page(), &c0);\n"},{"Del":" if cursor.pointer >= cursor.first_rc_level {\n for o in (&*k).page_offsets().chain((&*v).page_offsets()) {\n txn.incr_rc(o)?;\n }\n"}]}},{"Edit":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":192,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":33162},"to":{"change":2,"start":2828,"end":2889},"introduced_by":2}],"inode":{"change":5,"pos":52511}}},"contents":[{"Del":" deleted = Some(P::save_deleted_leaf_entry(k, v))\n"}]}},{"Edit":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":193,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":33306}],"down_context":[{"change":5,"pos":33306}],"flag":"BLOCK","start":1931,"end":1988,"inode":{"change":5,"pos":52511}}},"contents":[{"Add":" deleted = Some(P::save_deleted_leaf_entry(k, v))"}]}},{"Replacement":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":198,"ins":{"up_context":[{"change":5,"pos":33374}],"down_context":[{"change":5,"pos":33435}],"flag":"BLOCK","start":1989,"end":2052,"inode":{"change":5,"pos":52511}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":33374},"to":{"change":5,"start":33374,"end":33435},"introduced_by":5}],"inode":{"change":5,"pos":52511}},"ins_contents":[{"Add":" mutable: cursor.pointer() < cursor.first_rc_level,"}],"del_contents":[{"Del":" mutable: cursor.pointer < cursor.first_rc_level,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":224,"ins":{"up_context":[{"change":5,"pos":19536}],"down_context":[{"change":5,"pos":33754}],"flag":"BLOCK","start":2053,"end":2083,"inode":{"change":5,"pos":52511}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":19536},"to":{"change":5,"start":33726,"end":33754},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":62136},"to":{"change":5,"start":33726,"end":33754},"introduced_by":5}],"inode":{"change":5,"pos":52511}},"ins_contents":[{"Add":" let p = cursor.pointer();"}],"del_contents":[{"Del":" let p = cursor.pointer;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":278,"ins":{"up_context":[{"change":5,"pos":20246}],"down_context":[{"change":5,"pos":34437}],"flag":"BLOCK","start":2084,"end":2144,"inode":{"change":5,"pos":52511}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":20246},"to":{"change":5,"start":34379,"end":34437},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":34379},"to":{"change":5,"start":34379,"end":34437},"introduced_by":5}],"inode":{"change":5,"pos":52511}},"ins_contents":[{"Add":" let mutable = cursor.pointer() < cursor.first_rc_level;"}],"del_contents":[{"Del":" let mutable = cursor.pointer < cursor.first_rc_level;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":319,"ins":{"up_context":[{"change":5,"pos":35718}],"down_context":[{"change":2,"pos":3165}],"flag":"BLOCK","start":2145,"end":2185,"inode":{"change":5,"pos":52511}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":35718},"to":{"change":5,"start":35718,"end":35756},"introduced_by":5}],"inode":{"change":5,"pos":52511}},"ins_contents":[{"Add":" if cursor.pointer() == p0 {"}],"del_contents":[{"Del":" if cursor.pointer == p0 {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":345,"ins":{"up_context":[{"change":5,"pos":36543}],"down_context":[{"change":5,"pos":36581}],"flag":"BLOCK","start":2186,"end":2226,"inode":{"change":5,"pos":52511}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":36543},"to":{"change":5,"start":36543,"end":36581},"introduced_by":5}],"inode":{"change":5,"pos":52511}},"ins_contents":[{"Add":" if cursor.pointer() == p0 {"}],"del_contents":[{"Del":" if cursor.pointer == p0 {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":374,"ins":{"up_context":[{"change":5,"pos":20503}],"down_context":[{"change":5,"pos":37710}],"flag":"BLOCK","start":2227,"end":2310,"inode":{"change":5,"pos":52511}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":20503},"to":{"change":5,"start":10411,"end":10492},"introduced_by":5}],"inode":{"change":5,"pos":52511}},"ins_contents":[{"Add":" if cursor.pointer() + 1 >= cursor.first_rc_level && !split_key_is_k0 {"}],"del_contents":[{"Del":" if cursor.pointer + 1 >= cursor.first_rc_level && !split_key_is_k0 {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":382,"ins":{"up_context":[{"change":5,"pos":37905}],"down_context":[{"change":5,"pos":62825}],"flag":"BLOCK","start":2311,"end":2401,"inode":{"change":5,"pos":52511}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":37905},"to":{"change":5,"start":37905,"end":37991},"introduced_by":5}],"inode":{"change":5,"pos":52511}},"ins_contents":[{"Add":" if cursor.pointer() < cursor.first_rc_level {"},{"Add":" free[cursor.pointer()] = freed;"}],"del_contents":[{"Del":" if cursor.pointer < cursor.first_rc_level {\n free[cursor.pointer] = freed;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":52511},"path":"sanakirja-core/src/btree/del.rs","line":385,"ins":{"up_context":[{"change":5,"pos":62831}],"down_context":[{"change":5,"pos":38150}],"flag":"BLOCK","start":2402,"end":2474,"inode":{"change":5,"pos":52511}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":62831},"to":{"change":5,"start":20583,"end":20653},"introduced_by":5}],"inode":{"change":5,"pos":52511}},"ins_contents":[{"Add":" modify_rc(txn, &last_op, cursor.pointer(), cursor.first_rc_level)?;"}],"del_contents":[{"Del":" modify_rc(txn, &last_op, cursor.pointer, cursor.first_rc_level)?;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":63682},"path":"sanakirja-core/src/btree/cursor.rs","line":41,"ins":{"up_context":[{"change":5,"pos":11010}],"down_context":[{"change":5,"pos":65137}],"flag":"BLOCK","start":2475,"end":2653,"inode":{"change":5,"pos":63682}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":51806},"to":{"change":5,"start":24668,"end":24741},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":11010},"to":{"change":5,"start":24668,"end":24741},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":24668},"to":{"change":5,"start":24668,"end":24741},"introduced_by":5}],"inode":{"change":5,"pos":63682}},"ins_contents":[{"Add":" // Invariant: all items up to (and including) stack[pointer],"},{"Add":" // except possibly 0, are initialised."},{"Add":" stack: [core::mem::MaybeUninit>; N_CURSORS],"}],"del_contents":[{"Del":" pub stack: [core::mem::MaybeUninit>; N_CURSORS],\n"}]}},{"Replacement":{"inode":{"change":5,"pos":63682},"path":"sanakirja-core/src/btree/cursor.rs","line":45,"ins":{"up_context":[{"change":5,"pos":65168}],"down_context":[{"change":5,"pos":65192}],"flag":"BLOCK","start":2654,"end":3300,"inode":{"change":5,"pos":63682}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":65168},"to":{"change":5,"start":65168,"end":65192},"introduced_by":5}],"inode":{"change":5,"pos":63682}},"ins_contents":[{"Add":" pointer: usize,"},{"Add":"}"},{"Add":""},{"Add":"impl>"},{"Add":" core::ops::Index for Cursor"},{"Add":"{"},{"Add":" type Output = PageCursor;"},{"Add":" fn index(&self, i: usize) -> &PageCursor {"},{"Add":" assert!(i <= self.pointer);"},{"Add":" unsafe { &*self.stack.index(i).as_ptr() }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl>"},{"Add":" core::ops::IndexMut for Cursor"},{"Add":"{"},{"Add":" fn index_mut(&mut self, i: usize) -> &mut PageCursor {"},{"Add":" assert!(i <= self.pointer);"},{"Add":" unsafe { &mut *self.stack.index_mut(i).as_mut_ptr() }"},{"Add":" }"}],"del_contents":[{"Del":" pub pointer: usize,\n"}]}},{"Edit":{"inode":{"change":5,"pos":63682},"path":"sanakirja-core/src/btree/cursor.rs","line":72,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":65498}],"down_context":[{"change":5,"pos":65498}],"flag":"BLOCK","start":3301,"end":3423,"inode":{"change":5,"pos":63682}}},"contents":[{"Add":" cursor: None,"},{"Add":" });"},{"Add":" stack[0] = MaybeUninit::new(PageCursor {"},{"Add":" page: CowPage::null(),"}]}},{"Edit":{"inode":{"change":5,"pos":63682},"path":"sanakirja-core/src/btree/cursor.rs","line":83,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":65645}],"down_context":[{"change":5,"pos":65645}],"flag":"BLOCK","start":3424,"end":3566,"inode":{"change":5,"pos":63682}}},"contents":[{"Add":" }"},{"Add":""},{"Add":" pub fn push(&mut self, p: PageCursor) {"},{"Add":" self.pointer += 1;"},{"Add":" self.stack[self.pointer] = MaybeUninit::new(p)"}]}},{"Edit":{"inode":{"change":5,"pos":63682},"path":"sanakirja-core/src/btree/cursor.rs","line":89,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":65651}],"down_context":[{"change":5,"pos":65651}],"flag":"BLOCK","start":3567,"end":3694,"inode":{"change":5,"pos":63682}}},"contents":[{"Add":""},{"Add":" pub fn last(&mut self) -> &mut PageCursor {"},{"Add":" unsafe { &mut *self.stack[self.pointer].as_mut_ptr() }"},{"Add":" }"}]}},{"Edit":{"inode":{"change":5,"pos":63682},"path":"sanakirja-core/src/btree/cursor.rs","line":100,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":65883}],"down_context":[{"change":5,"pos":25008}],"flag":"BLOCK","start":3695,"end":3821,"inode":{"change":5,"pos":63682}}},"contents":[{"Add":" pub fn pointer(&self) -> usize {"},{"Add":" self.pointer"},{"Add":" }"},{"Add":""},{"Add":" pub fn pop(&mut self) {"},{"Add":" self.pointer -= 1"},{"Add":" }"},{"Add":""}]}}],"owner":"pijul","repo":"sanakirja","token":"IdvVcTvzGUfjmiVF6bv0RBGEnH/JuVOGLK93C4FHXkk=","login":null}

…

Dependencies

Change contents