{"header":{"message":"reference counting works for put","description":null,"timestamp":"2021-01-31T20:41:59.218685315Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"ONES3V466GLO5CXKRF5ENK7VFOQPWM3YXLVRGWB56V5SH3W7XNBQC","authors":[],"deps":{"hashes":[["ONES3V466GLO5CXKRF5ENK7VFOQPWM3YXLVRGWB56V5SH3W7XNBQC","reference counting works for put"],["AA",null],["EAAYH6BQWDK52EC5RG3BEZQU3FJPN5RRRN4U5KDKDVPKXBVJMNDAC","Debugging put"],["FMN7X4J24EYPOJNBUWM4NKGWSJTRV2DHCIBMPV2AXLZVVAMNOBKQC","Micro-improvements, now noticeably faster than std::collections::BTreeMap"],["WS4ZQM4RMIHZ6XZKSDQJGHN5SSSWFL4H236USOPUA33S6RC53RFAC","Debugging, tests, etc."],["OP6SVMOD2GTQ7VNJ4E5KYFG4MIYA7HBMXJTADALMZH4PY7OQRMZQC","Resetting history"]],"deps":["EAAYH6BQWDK52EC5RG3BEZQU3FJPN5RRRN4U5KDKDVPKXBVJMNDAC"],"known":["OP6SVMOD2GTQ7VNJ4E5KYFG4MIYA7HBMXJTADALMZH4PY7OQRMZQC","FMN7X4J24EYPOJNBUWM4NKGWSJTRV2DHCIBMPV2AXLZVVAMNOBKQC","WS4ZQM4RMIHZ6XZKSDQJGHN5SSSWFL4H236USOPUA33S6RC53RFAC"]},"hunks":[{"Replacement":{"inode":{"change":3,"pos":3448},"path":"sanakirja-core/src/btree/put.rs","line":27,"ins":{"up_context":[{"change":3,"pos":4449}],"down_context":[{"change":3,"pos":673}],"flag":"BLOCK","start":0,"end":69,"inode":{"change":3,"pos":3448}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":4449},"to":{"change":3,"start":637,"end":673},"introduced_by":3}],"inode":{"change":3,"pos":3448}},"ins_contents":[{"Add":" debug!(\"put: {:?} {:?}\", cursor.pointer, cursor.first_rc_level);"}],"del_contents":[{"Del":" debug!(\"{:?}\", cursor.pointer);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":3448},"path":"sanakirja-core/src/btree/put.rs","line":33,"ins":{"up_context":[{"change":3,"pos":4538}],"down_context":[{"change":3,"pos":4587}],"flag":"BLOCK","start":70,"end":118,"inode":{"change":3,"pos":3448}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":4538},"to":{"change":3,"start":4538,"end":4587},"introduced_by":3}],"inode":{"change":3,"pos":3448}},"ins_contents":[{"Add":" cursor.pointer < cursor.first_rc_level,"}],"del_contents":[{"Del":" cursor.pointer <= cursor.first_rc_level,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":3448},"path":"sanakirja-core/src/btree/put.rs","line":137,"ins":{"up_context":[{"change":3,"pos":7865}],"down_context":[{"change":3,"pos":7918}],"flag":"BLOCK","start":119,"end":176,"inode":{"change":3,"pos":3448}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7865},"to":{"change":3,"start":7865,"end":7918},"introduced_by":3}],"inode":{"change":3,"pos":3448}},"ins_contents":[{"Add":" if cursor.pointer == cursor.first_rc_level + 1 {"}],"del_contents":[{"Del":" if cursor.pointer == cursor.first_rc_level {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":3448},"path":"sanakirja-core/src/btree/put.rs","line":142,"ins":{"up_context":[{"change":3,"pos":8058}],"down_context":[{"change":3,"pos":8099}],"flag":"BLOCK","start":177,"end":214,"inode":{"change":3,"pos":3448}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8058},"to":{"change":3,"start":8058,"end":8099},"introduced_by":3}],"inode":{"change":3,"pos":3448}},"ins_contents":[{"Add":" txn.decr_rc(freed)?;"}],"del_contents":[{"Del":" txn.decr_rc(freed ^ 1)?;\n"}]}},{"Edit":{"inode":{"change":3,"pos":8623},"path":"sanakirja-core/src/btree/page.rs","line":137,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":2293}],"down_context":[{"change":3,"pos":2293}],"flag":"BLOCK","start":215,"end":254,"inode":{"change":3,"pos":8623}}},"contents":[{"Add":" debug!(\"new = {:?}\", new);"}]}},{"Edit":{"inode":{"change":3,"pos":8623},"path":"sanakirja-core/src/btree/page.rs","line":139,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":2360}],"down_context":[{"change":3,"pos":2360}],"flag":"BLOCK","start":255,"end":403,"inode":{"change":3,"pos":8623}}},"contents":[{"Add":" let l = header(page.as_page()).left_page() & !0xfff;"},{"Add":" let hdr = header_mut(&mut new);"},{"Add":" hdr.left_page = l.to_le();"}]}},{"Edit":{"inode":{"change":3,"pos":45735},"path":"sanakirja-core/src/btree/mod.rs","line":279,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":4199}],"down_context":[{"change":2,"pos":4199}],"flag":"BLOCK","start":404,"end":1543,"inode":{"change":3,"pos":45735}}},"contents":[{"Add":"}"},{"Add":""},{"Add":""},{"Add":"pub fn get<'a, T: LoadPage, K: Representable, V: Representable, P: BTreePage>("},{"Add":" txn: &'a T,"},{"Add":" db: &Db,"},{"Add":" k: &K,"},{"Add":" v: Option<&V>,"},{"Add":") -> Result, T::Error> {"},{"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 = db.db;"},{"Add":" for _ in 0..cursor::N_CURSORS {"},{"Add":" let mut cursor = P::first_cursor(page.as_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)));"},{"Add":" }"},{"Add":" last_match = Some((kk, vv));"},{"Add":" } else if let Some((k, v, _)) = P::current(page.as_page(), &cursor) {"},{"Add":" unsafe { last_match = Some(("},{"Add":" core::mem::transmute(k),"},{"Add":" core::mem::transmute(v),"},{"Add":" )) }"},{"Add":" }"},{"Add":" let next_page = P::left_child(page.as_page(), &cursor);"},{"Add":" if next_page > 0 {"},{"Add":" page = txn.load_page(next_page)?;"},{"Add":" } else {"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(last_match)"}]}},{"Replacement":{"inode":{"change":3,"pos":63682},"path":"sanakirja-core/src/btree/cursor.rs","line":86,"ins":{"up_context":[{"change":3,"pos":2548}],"down_context":[{"change":3,"pos":2548}],"flag":"BLOCK","start":1544,"end":1601,"inode":{"change":3,"pos":63682}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2548},"to":{"change":3,"start":34118,"end":34163},"introduced_by":3}],"inode":{"change":3,"pos":63682}},"ins_contents":[{"Add":" debug!(\"self.pointer = {:?}\", self.pointer);"}],"del_contents":[{"Del":" debug!(\"p: {:?}\", self.pointer);\n"}]}},{"Edit":{"inode":{"change":3,"pos":63682},"path":"sanakirja-core/src/btree/cursor.rs","line":89,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":66371}],"down_context":[{"change":3,"pos":66371}],"flag":"BLOCK","start":1602,"end":1684,"inode":{"change":3,"pos":63682}}},"contents":[{"Add":" debug!(\"page = {:?}, rc = {:?}\", current.page, txn.rc(page.offset)?);"}]}},{"Edit":{"inode":{"change":3,"pos":63682},"path":"sanakirja-core/src/btree/cursor.rs","line":91,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":66450}],"down_context":[{"change":3,"pos":66450}],"flag":"BLOCK","start":1685,"end":1748,"inode":{"change":3,"pos":63682}}},"contents":[{"Add":" debug!(\"first_rc_level = {:?}\", self.pointer);"}]}},{"Replacement":{"inode":{"change":3,"pos":79574},"path":"sanakirja/src/lib.rs","line":7,"ins":{"up_context":[{"change":2,"pos":4433}],"down_context":[{"change":3,"pos":79615}],"flag":"BLOCK","start":1749,"end":1764,"inode":{"change":3,"pos":79574}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4433},"to":{"change":2,"start":4433,"end":4444},"introduced_by":2}],"inode":{"change":3,"pos":79574}},"ins_contents":[{"Add":"pub mod debug;"}],"del_contents":[{"Del":"mod debug;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":249,"ins":{"up_context":[{"change":3,"pos":38650}],"down_context":[{"change":3,"pos":38683}],"flag":"BLOCK","start":1765,"end":1789,"inode":{"change":3,"pos":80166}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":38650},"to":{"change":3,"start":38650,"end":38683},"introduced_by":3}],"inode":{"change":3,"pos":80166}},"ins_contents":[{"Add":" if rc > 1 {"}],"del_contents":[{"Del":" if rc & 0xfff >= 2 {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":251,"ins":{"up_context":[{"change":3,"pos":38739}],"down_context":[{"change":3,"pos":38850}],"flag":"BLOCK","start":1790,"end":1934,"inode":{"change":3,"pos":80166}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":38739},"to":{"change":3,"start":38739,"end":38850},"introduced_by":3}],"inode":{"change":3,"pos":80166}},"ins_contents":[{"Add":" }"},{"Add":" if rc & 0xfff > 2 {"},{"Add":" btree::put(self, &mut rc_, &(rc - 1), &())?;"},{"Add":" self.rc = Some(rc_);"}],"del_contents":[{"Del":" if rc > 2 {\n btree::put(self, &mut rc_, &(rc - 1), &())?;\n }\n"}]}},{"Edit":{"inode":{"change":3,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":256,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":38880}],"down_context":[{"change":3,"pos":89113}],"flag":"BLOCK","start":1935,"end":1992,"inode":{"change":3,"pos":80166}}},"contents":[{"Add":" } else {"},{"Add":" self.rc = Some(rc_)"}]}},{"Edit":{"inode":{"change":3,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":265,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":89253}],"down_context":[{"change":3,"pos":89281}],"flag":"BLOCK","start":1993,"end":2036,"inode":{"change":3,"pos":80166}}},"contents":[{"Add":" debug!(\"decr_rc_owned {:?}\", off);"}]}},{"Replacement":{"inode":{"change":3,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":278,"ins":{"up_context":[{"change":3,"pos":39178}],"down_context":[{"change":3,"pos":39211}],"flag":"BLOCK","start":2037,"end":2098,"inode":{"change":3,"pos":80166}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":39178},"to":{"change":3,"start":39178,"end":39211},"introduced_by":3}],"inode":{"change":3,"pos":80166}},"ins_contents":[{"Add":" debug!(\"rc = {:?}\", rc);"},{"Add":" if rc > 1 {"}],"del_contents":[{"Del":" if rc & 0xfff >= 2 {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":281,"ins":{"up_context":[{"change":3,"pos":39267}],"down_context":[{"change":3,"pos":39361}],"flag":"BLOCK","start":2099,"end":2243,"inode":{"change":3,"pos":80166}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":39267},"to":{"change":3,"start":39267,"end":39360},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":39360},"to":{"change":3,"start":89828,"end":89846},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":89828},"to":{"change":3,"start":89828,"end":89846},"introduced_by":3}],"inode":{"change":3,"pos":80166}},"ins_contents":[{"Add":" }"},{"Add":" if rc & 0xfff > 2 {"},{"Add":" btree::put(self, &mut rc_, &(rc - 1), &())?;"},{"Add":" self.rc = Some(rc_);"}],"del_contents":[{"Del":" if rc > 2 {\n btree::put(self, &mut rc_, &(rc - 1), &())?;\n"},{"Del":" }\n"}]}},{"Edit":{"inode":{"change":3,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":286,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":39391}],"down_context":[{"change":3,"pos":89949}],"flag":"BLOCK","start":2244,"end":2302,"inode":{"change":3,"pos":80166}}},"contents":[{"Add":" } else {"},{"Add":" self.rc = Some(rc_);"}]}},{"Edit":{"inode":{"change":3,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":295,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":90122}],"down_context":[{"change":3,"pos":90122}],"flag":"BLOCK","start":2303,"end":2340,"inode":{"change":3,"pos":80166}}},"contents":[{"Add":" debug!(\"incr_rc {:?}\", off);"}]}},{"Edit":{"inode":{"change":3,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":313,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":90699}],"down_context":[{"change":3,"pos":90699}],"flag":"BLOCK","start":2341,"end":2580,"inode":{"change":3,"pos":80166}}},"contents":[{"Add":" } else {"},{"Add":" let mut rc = btree::create_db(self)?;"},{"Add":" debug!(\"put in RC: {:?} {:?}\", rc, off|2);"},{"Add":" btree::put(self, &mut rc, &(off | 2), &())?;"},{"Add":" debug!(\"done\");"},{"Add":" self.rc = Some(rc);"}]}},{"Replacement":{"inode":{"change":3,"pos":80166},"path":"sanakirja/src/environment/muttxn.rs","line":335,"ins":{"up_context":[{"change":3,"pos":91142}],"down_context":[{"change":3,"pos":91357}],"flag":"BLOCK","start":2581,"end":2653,"inode":{"change":3,"pos":80166}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":91142},"to":{"change":3,"start":91142,"end":91357},"introduced_by":3}],"inode":{"change":3,"pos":80166}},"ins_contents":[{"Add":" if let Some((rc, _)) = btree::get(self, rc, &page, None)? {"}],"del_contents":[{"Del":" let mut curs: btree::cursor::Cursor> =\n btree::cursor::Cursor::new(rc);\n if let Some((rc, _)) = curs.set(self, Some((&page, None)))? {\n"}]}}],"owner":"pijul","repo":"sanakirja","token":"3E9bltq2NNoa9U1/g4Za2lS3fhwPDeosLMx8iduqk+k=","login":null}

…

Dependencies

Change contents