{"header":{"message":"Adding the block module","description":null,"timestamp":"2020-11-25T18:43:10.488732587Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"ERV3644QELKOHAVNMZGRWYCPPN3XELTAH4PPFR6QKGWW73XBOOKQC","authors":[],"deps":{"hashes":[["ERV3644QELKOHAVNMZGRWYCPPN3XELTAH4PPFR6QKGWW73XBOOKQC","Adding the block module"],["AA",null],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."]],"deps":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC"],"known":[]},"hunks":[{"FileAdd":{"meta":{"basename":"block.rs","metadata":420},"context":[{"change":2,"pos":525229}],"contents":[{"Add":"use super::*;"},{"Add":""},{"Add":"/// Find the key where a position is."},{"Add":"pub(crate) fn find_block<'db, 'txn: 'db, T: TxnT>("},{"Add":" txn: &'txn T,"},{"Add":" channel: &'db Channel,"},{"Add":" p: Position,"},{"Add":") -> Result, crate::Error> {"},{"Add":" if p.change.is_root() {"},{"Add":" return Ok(Vertex::ROOT);"},{"Add":" }"},{"Add":" let key = Vertex {"},{"Add":" change: p.change,"},{"Add":" start: p.pos,"},{"Add":" end: p.pos,"},{"Add":" };"},{"Add":" debug!(target: \"libpijul::find_block\", \"find_block {:?}\", key);"},{"Add":" let mut cursor = txn.cursor_graph(&channel.graph, Some((key, None)));"},{"Add":" let mut k = if let Some((k, _)) = cursor.next() {"},{"Add":" k"},{"Add":" } else {"},{"Add":" return Err(crate::Error::WrongBlock { block: p });"},{"Add":" };"},{"Add":" debug!(\"k = {:?}\", k);"},{"Add":" // The only guarantee here is that k is either the first key"},{"Add":" // >= `key`, or the key just before that. We might need to"},{"Add":" // rewind by one step if key is strictly larger than the"},{"Add":" // result (i.e. if `p` is in the middle of the key)."},{"Add":" while k.change > p.change || (k.change == p.change && k.start > p.pos) {"},{"Add":" debug!(target: \"libpijul::find_block\", \"find_block while {:?}\", k);"},{"Add":" if let Some((k_, _)) = cursor.prev() {"},{"Add":" k = k_"},{"Add":" } else {"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" loop {"},{"Add":" debug!(target: \"libpijul::find_block\", \"find_block loop {:?}\", k);"},{"Add":" if k.change == p.change && k.start <= p.pos {"},{"Add":" if k.end > p.pos || (k.start == k.end && k.end == p.pos) {"},{"Add":" return Ok(k);"},{"Add":" }"},{"Add":" } else if k.change > p.change {"},{"Add":" return Err(crate::Error::WrongBlock { block: p });"},{"Add":" }"},{"Add":" if let Some((k_, _)) = cursor.next() {"},{"Add":" k = k_"},{"Add":" } else {"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" debug!(target: \"libpijul::find_block\", \"find_block None, {:?}\", k);"},{"Add":" Err(crate::Error::WrongBlock { block: p })"},{"Add":"}"},{"Add":""},{"Add":"/// Find the key ending at a position."},{"Add":"pub(crate) fn find_block_end<'db, 'txn: 'db, T: TxnT>("},{"Add":" txn: &'txn T,"},{"Add":" channel: &'db Channel,"},{"Add":" p: Position,"},{"Add":") -> Result, crate::Error> {"},{"Add":" if p.change.is_root() {"},{"Add":" return Ok(Vertex::ROOT);"},{"Add":" }"},{"Add":" let key = Vertex {"},{"Add":" change: p.change,"},{"Add":" start: p.pos,"},{"Add":" end: p.pos,"},{"Add":" };"},{"Add":" debug!(target: \"libpijul::find_block_end\", \"find_block_end {:?}, p.change.0 = {:?}\", key, p.change.0);"},{"Add":" let mut cursor = txn.cursor_graph(&channel.graph, Some((key, None)));"},{"Add":" let mut k = if let Some((k, _)) = cursor.next() {"},{"Add":" k"},{"Add":" } else {"},{"Add":" return Err(crate::Error::WrongBlock { block: p });"},{"Add":" };"},{"Add":" // The only guarantee here is that k is either the first key"},{"Add":" // before `key`, or the key just before that."},{"Add":" loop {"},{"Add":" debug!(target: \"libpijul::find_block_end\", \"find_block_end loop {:?} k.change.0 = {:?}\", k, k.change.0);"},{"Add":" if k.change < p.change {"},{"Add":" break;"},{"Add":" } else if k.change == p.change {"},{"Add":" // Here we want to create an edge pointing between `p`"},{"Add":" // and its successor. If k.start == p.pos, the only"},{"Add":" // case where that's what we want is if k.start =="},{"Add":" // k.end."},{"Add":" if k.start == p.pos && k.end == p.pos {"},{"Add":" break;"},{"Add":" } else if k.start < p.pos {"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" if let Some((k_, _)) = cursor.prev() {"},{"Add":" k = k_"},{"Add":" } else {"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" // We also want k.end >= p.pos, so we just call next() until"},{"Add":" // we have that."},{"Add":" debug!(target: \"libpijul::find_block_end\", \"find_block_end k(0) = {:?} k.change.0 = {:?}\", k, k.change.0);"},{"Add":" while k.change < p.change || (k.change == p.change && p.pos > k.end) {"},{"Add":" if let Some((k_, _)) = cursor.next() {"},{"Add":" k = k_"},{"Add":" } else {"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" debug!(target: \"libpijul::find_block_end\", \"find_block_end k(1) = {:?}, k.change.0 = {:?}\", k, k.change.0);"},{"Add":" if k.change == p.change && k.start <= p.pos && p.pos <= k.end {"},{"Add":" Ok(k)"},{"Add":" } else {"},{"Add":" Err(crate::Error::WrongBlock { block: p })"},{"Add":" }"},{"Add":"}"}]}}],"owner":"irevoire","repo":"pijul","token":"JkhhZkD4ArBX0f49K0Wym4QznfpzucG6ihUhAkREBw0=","login":null}

…

Dependencies

Change contents