{"header":{"message":"automerge: Make a doc index based on sanakirja","description":null,"timestamp":"2023-09-14T17:27:49.816339478Z","authors":[{}]},"hash":"3RLAEX2L5AGTVBRHDZH3MTJP6JND2J4KPGPQ4DTKTBD6KKJWHTFQC","authors":[{"login":"kim","key":"GatQwNAvmxN5tCNcwspWc3AJdZydkGgDErEEr6JJLffY"}],"deps":{"hashes":[["3RLAEX2L5AGTVBRHDZH3MTJP6JND2J4KPGPQ4DTKTBD6KKJWHTFQC","automerge: Make a doc index based on sanakirja"],["AA",null],["U63IONGETCB4NUGTSWYUJQMZNR5O6ZZKIPPBYJPBGVLAFXSFDNOAC","Start dabbling"]],"deps":["U63IONGETCB4NUGTSWYUJQMZNR5O6ZZKIPPBYJPBGVLAFXSFDNOAC"],"known":[]},"hunks":[{"Edit":{"inode":{"change":2,"pos":4045},"path":"nestje-automerge/src/store/fs.rs","line":25,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":4401}],"down_context":[{"change":2,"pos":4401}],"flag":"BLOCK","start":0,"end":47,"inode":{"change":2,"pos":4045}}},"contents":[{"Add":""},{"Add":"pub const FILE_EXTENSION: &str = \"am.change\";"}]}},{"Replacement":{"inode":{"change":2,"pos":4045},"path":"nestje-automerge/src/store/fs.rs","line":55,"ins":{"up_context":[{"change":2,"pos":5072}],"down_context":[{"change":2,"pos":5112}],"flag":"BLOCK","start":48,"end":91,"inode":{"change":2,"pos":4045}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":5072},"to":{"change":2,"start":5072,"end":5112},"introduced_by":2}],"inode":{"change":2,"pos":4045}},"ins_contents":[{"Add":" buf.set_extension(FILE_EXTENSION);"}],"del_contents":[{"Del":" buf.set_extension(\"automerge\");\n"}]}},{"Replacement":{"inode":{"change":2,"pos":6208},"path":"nestje-automerge/src/lib.rs","line":7,"ins":{"up_context":[{"change":2,"pos":6345}],"down_context":[],"flag":"BLOCK","start":92,"end":107,"inode":{"change":2,"pos":6208}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":6345},"to":{"change":2,"start":6345,"end":6375},"introduced_by":2}],"inode":{"change":2,"pos":6208}},"ins_contents":[{"Add":"pub mod index;"}],"del_contents":[{"Del":"mod hash;\npub use hash::Hash;\n"}]}},{"FileAdd":{"meta":{"basename":"index.rs","metadata":0},"context":[{"change":2,"pos":3514}],"contents":[{"Add":"// Copyright © 2023 Kim Altintop "},{"Add":"// SPDX-License-Identifier: GPL-2.0-only"},{"Add":""},{"Add":"use std::{"},{"Add":" path::Path,"},{"Add":" sync::Arc,"},{"Add":"};"},{"Add":""},{"Add":"use automerge::ChangeHash;"},{"Add":"use libpijul::{"},{"Add":" pristine::L64,"},{"Add":" small_string::{"},{"Add":" SmallStr,"},{"Add":" SmallString,"},{"Add":" },"},{"Add":"};"},{"Add":"use sanakirja::{"},{"Add":" btree::{"},{"Add":" self,"},{"Add":" Db,"},{"Add":" UDb,"},{"Add":" },"},{"Add":" direct_repr,"},{"Add":" RootDb,"},{"Add":" Storable,"},{"Add":" UnsizedStorable,"},{"Add":"};"},{"Add":"use thiserror::Error;"},{"Add":""},{"Add":"#[cfg(test)]"},{"Add":"mod tests;"},{"Add":""},{"Add":"#[derive(Clone, Copy, Debug, PartialEq)]"},{"Add":"#[repr(usize)]"},{"Add":"pub enum Root {"},{"Add":" Version,"},{"Add":" Docs,"},{"Add":"}"},{"Add":""},{"Add":"const VERSION: L64 = L64(1u64.to_le());"},{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum Error {"},{"Add":" #[error(\"already exists: {0}\")]"},{"Add":" AlreadyExists(String),"},{"Add":" #[error(\"version mismatch\")]"},{"Add":" Version,"},{"Add":" #[error(\"missing root: {0:?}\")]"},{"Add":" MissingRoot(Root),"},{"Add":" #[error(transparent)]"},{"Add":" Sanakirja(#[from] sanakirja::Error),"},{"Add":"}"},{"Add":""},{"Add":"pub struct Sanakirja {"},{"Add":" env: Arc,"},{"Add":"}"},{"Add":""},{"Add":"impl Sanakirja {"},{"Add":" pub fn new(name: Option<&Path>) -> Result {"},{"Add":" let sz = 1 << 20;"},{"Add":" let roots = 2;"},{"Add":" match name {"},{"Add":" None => sanakirja::Env::new_anon(sz, roots),"},{"Add":" Some(name) => sanakirja::Env::new(name, sz, roots),"},{"Add":" }"},{"Add":" .map(Arc::new)"},{"Add":" .map(|env| Self { env })"},{"Add":" .map_err(Into::into)"},{"Add":" }"},{"Add":""},{"Add":" pub fn txn_begin(&self) -> Result {"},{"Add":" let txn = sanakirja::Env::txn_begin(self.env.clone())?;"},{"Add":" if L64(txn.root(Root::Version as usize)) != VERSION {"},{"Add":" return Err(Error::Version);"},{"Add":" }"},{"Add":""},{"Add":" let docs = txn"},{"Add":" .root_db(Root::Docs as usize)"},{"Add":" .ok_or_else(|| Error::MissingRoot(Root::Docs))?;"},{"Add":""},{"Add":" Ok(Txn { docs, txn })"},{"Add":" }"},{"Add":""},{"Add":" pub fn mut_txn_begin(&self) -> Result, Error> {"},{"Add":" let mut txn = sanakirja::Env::mut_txn_begin(self.env.clone())?;"},{"Add":" if let Some(version) = txn.root(Root::Version as usize) {"},{"Add":" if L64(version) != VERSION {"},{"Add":" return Err(Error::Version);"},{"Add":" }"},{"Add":" } else {"},{"Add":" txn.set_root(Root::Version as usize, VERSION.0);"},{"Add":" }"},{"Add":""},{"Add":" let docs = txn"},{"Add":" .root_db(Root::Docs as usize)"},{"Add":" .map_or_else(|| btree::create_db_(&mut txn), Ok)?;"},{"Add":""},{"Add":" Ok(MutTxn { docs, txn })"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub struct Doc {"},{"Add":" changes: Db,"},{"Add":"}"},{"Add":""},{"Add":"impl Doc {"},{"Add":" pub fn changes(&self, txn: &GenericTxn) -> Result, Error>"},{"Add":" where"},{"Add":" T: sanakirja::LoadPage + sanakirja::RootPage,"},{"Add":" {"},{"Add":" let mut changes = Vec::new();"},{"Add":" for x in btree::iter(&txn.txn, &self.changes, None)? {"},{"Add":" let (t, hash) = x?;"},{"Add":" changes.push((t.0, (*hash).into()));"},{"Add":" }"},{"Add":""},{"Add":" Ok(changes)"},{"Add":" }"},{"Add":""},{"Add":" pub fn put_change(&mut self, txn: &mut MutTxn, change: ChangeHash) -> Result<(), Error> {"},{"Add":" let last = if let Some(max) = btree::rev_iter(&txn.txn, &self.changes, None)?.next() {"},{"Add":" let (L64(x), _) = max?;"},{"Add":" *x"},{"Add":" } else {"},{"Add":" 0"},{"Add":" };"},{"Add":""},{"Add":" btree::put("},{"Add":" &mut txn.txn,"},{"Add":" &mut self.changes,"},{"Add":" &L64(last + 1),"},{"Add":" &change.into(),"},{"Add":" )?;"},{"Add":""},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd)]"},{"Add":"#[repr(C)]"},{"Add":"struct StoredDoc {"},{"Add":" changes: L64,"},{"Add":"}"},{"Add":""},{"Add":"direct_repr!(StoredDoc);"},{"Add":"impl sanakirja::debug::Check for StoredDoc {}"},{"Add":""},{"Add":"// TODO:"},{"Add":"// * Versioning?"},{"Add":"// * Ask automerge to export HASH_SIZE"},{"Add":"#[derive(Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd)]"},{"Add":"#[repr(C)]"},{"Add":"struct StoredHash([u8; 32]);"},{"Add":""},{"Add":"direct_repr!(StoredHash);"},{"Add":"impl sanakirja::debug::Check for StoredHash {}"},{"Add":""},{"Add":"impl From for StoredHash {"},{"Add":" fn from(ChangeHash(h): ChangeHash) -> Self {"},{"Add":" Self(h)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl From for ChangeHash {"},{"Add":" fn from(StoredHash(h): StoredHash) -> Self {"},{"Add":" Self(h)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub type Txn = GenericTxn>>;"},{"Add":"pub type MutTxn = GenericTxn, T>>;"},{"Add":""},{"Add":"pub struct GenericTxn {"},{"Add":" txn: T,"},{"Add":" // All documents, by name"},{"Add":" docs: UDb,"},{"Add":"}"},{"Add":""},{"Add":"impl MutTxn<()> {"},{"Add":" pub fn get_doc(&mut self, name: &str) -> Result, Error> {"},{"Add":" let name = SmallString::from_str(name);"},{"Add":" let doc = match btree::get(&self.txn, &self.docs, &name, None)? {"},{"Add":" Some((k, v)) if k == name.as_ref() => Some(Doc {"},{"Add":" changes: Db::from_page(v.changes.into()),"},{"Add":" }),"},{"Add":""},{"Add":" _ => None,"},{"Add":" };"},{"Add":""},{"Add":" Ok(doc)"},{"Add":" }"},{"Add":""},{"Add":" pub fn create_doc(&mut self, name: &str) -> Result {"},{"Add":" let name = SmallString::from_str(name);"},{"Add":" if let Some((k, _)) = btree::get(&self.txn, &self.docs, &name, None)? {"},{"Add":" if k == name.as_ref() {"},{"Add":" return Err(Error::AlreadyExists(name.as_str().to_owned()));"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" let doc = Doc {"},{"Add":" changes: btree::create_db(&mut self.txn)?,"},{"Add":" };"},{"Add":""},{"Add":" btree::del(&mut self.txn, &mut self.docs, &name, None)?;"},{"Add":" let stored = StoredDoc {"},{"Add":" changes: doc.changes.db.into(),"},{"Add":" };"},{"Add":" btree::put(&mut self.txn, &mut self.docs, &name, &stored)?;"},{"Add":""},{"Add":" Ok(doc)"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"index","metadata":576},"context":[{"change":2,"pos":3514}],"contents":[]}},{"FileAdd":{"meta":{"basename":"tests.rs","metadata":0},"context":[{"change":0,"pos":5330}],"contents":[{"Add":"// Copyright © 2023 Kim Altintop "},{"Add":"// SPDX-License-Identifier: GPL-2.0-only"},{"Add":""},{"Add":"use automerge::transaction::Transactable;"},{"Add":""},{"Add":"use crate::index;"},{"Add":""},{"Add":"#[test]"},{"Add":"fn test_store_load() -> anyhow::Result<()> {"},{"Add":" // The automerge README example"},{"Add":" let mut doc = automerge::AutoCommit::new();"},{"Add":" let contacts = doc.put_object(automerge::ROOT, \"contacts\", automerge::ObjType::List)?;"},{"Add":" let alice = doc.insert_object(&contacts, 0, automerge::ObjType::Map)?;"},{"Add":" doc.put(&alice, \"name\", \"Alice\")?;"},{"Add":" doc.put(&alice, \"email\", \"alice@example.com\")?;"},{"Add":" let bob = doc.insert_object(&contacts, 1, automerge::ObjType::Map)?;"},{"Add":" doc.put(&bob, \"name\", \"Bob\")?;"},{"Add":" doc.put(&bob, \"email\", \"bob@example.com\")?;"},{"Add":" doc.commit();"},{"Add":""},{"Add":" let g = index::Sanakirja::new(None)?;"},{"Add":" let mut txn = g.mut_txn_begin()?;"},{"Add":" let mut idx = txn.create_doc(\"test\")?;"},{"Add":""},{"Add":" let changes = doc"},{"Add":" .get_changes(&[])"},{"Add":" .into_iter()"},{"Add":" .map(|change| change.hash())"},{"Add":" .collect::>();"},{"Add":" for change in &changes {"},{"Add":" idx.put_change(&mut txn, *change)?;"},{"Add":" }"},{"Add":""},{"Add":" let stored = idx"},{"Add":" .changes(&txn)?"},{"Add":" .iter()"},{"Add":" .map(|(_, hash)| *hash)"},{"Add":" .collect::>();"},{"Add":" assert_eq!(changes, stored);"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"}]}},{"Edit":{"inode":{"change":2,"pos":7139},"path":"nestje-automerge/Cargo.toml","line":11,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":7316}],"down_context":[{"change":2,"pos":7316}],"flag":"BLOCK","start":6600,"end":6624,"inode":{"change":2,"pos":7139}}},"contents":[{"Add":"anyhow.workspace = true"}]}},{"Edit":{"inode":{"change":2,"pos":7139},"path":"nestje-automerge/Cargo.toml","line":16,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":7414}],"down_context":[{"change":2,"pos":7414}],"flag":"BLOCK","start":6625,"end":6652,"inode":{"change":2,"pos":7139}}},"contents":[{"Add":"sanakirja.workspace = true"}]}},{"Edit":{"inode":{"change":2,"pos":7503},"path":"Cargo.toml","line":16,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":7749}],"down_context":[{"change":2,"pos":7749}],"flag":"BLOCK","start":6653,"end":6666,"inode":{"change":2,"pos":7503}}},"contents":[{"Add":"anyhow = \"1\""}]}},{"Edit":{"inode":{"change":2,"pos":7503},"path":"Cargo.toml","line":22,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":7844}],"down_context":[{"change":2,"pos":7844}],"flag":"BLOCK","start":6667,"end":6685,"inode":{"change":2,"pos":7503}}},"contents":[{"Add":"sanakirja = \"1.3\""}]}},{"Edit":{"inode":{"change":2,"pos":7915},"path":"Cargo.lock","line":62,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":9552}],"down_context":[{"change":2,"pos":9552}],"flag":"BLOCK","start":6686,"end":6877,"inode":{"change":2,"pos":7915}}},"contents":[{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"anyhow\""},{"Add":"version = \"1.0.75\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6\""}]}},{"Edit":{"inode":{"change":2,"pos":7915},"path":"Cargo.lock","line":820,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":28170}],"down_context":[{"change":2,"pos":28170}],"flag":"BLOCK","start":6878,"end":6889,"inode":{"change":2,"pos":7915}}},"contents":[{"Add":" \"anyhow\","}]}},{"Edit":{"inode":{"change":2,"pos":7915},"path":"Cargo.lock","line":825,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":28216}],"down_context":[{"change":2,"pos":28216}],"flag":"BLOCK","start":6890,"end":6904,"inode":{"change":2,"pos":7915}}},"contents":[{"Add":" \"sanakirja\","}]}}],"owner":"kim","repo":"yapma","token":"P10ki9EjuJjdiMpQNczkEiJH2b/ZNjofQyyzA2xolMU=","login":null}

…

Dependencies

Change contents