irevoire/pijul - Change M2C6QW2AEUCPOM7UDQHXRXVV2Z4GQMEKZZKPM6GT7DG2CPIDUWAAC

Avoid serialising twice in order to save the changes' signatures

Created by pmeunier on September 21, 2021

M2C6QW2AEUCPOM7UDQHXRXVV2Z4GQMEKZZKPM6GT7DG2CPIDUWAAC

Dependencies

In channels

main

Change contents

Replacement in "pijul/src/commands/record.rs" at line 154 [7.101759]

∅:D[5.541] → [6.24:135]

B:BD[6.24] → [6.24:135]

B:BD[6.135] → [8.1912:2058]

            Either::A((txn, mut change, updates, hash, oldest)) => {
                let hash = hash.unwrap();
                change.unhashed = Some(serde_json::json!({
                    "signature": key.sign_raw(&hash.to_bytes())?,
                }));

[5.541]

[9.5950]

            Either::A((txn, mut change, updates, oldest)) => {
                let hash = repo.changes.save_change(&mut change, |change, hash| {
                    change.unhashed = Some(serde_json::json!({
                        "signature": key.sign_raw(&hash.to_bytes()).unwrap(),
                    }));
                    Ok::<_, anyhow::Error>(())
                })?;

Deletion in "pijul/src/commands/record.rs" at line 286 [7.101759]
B:BD[5.683] → [5.683:723]
```
                Option<libpijul::Hash>,
```
Deletion in "pijul/src/commands/record.rs" at line 414 [7.101759]
B:BD[7.109720] → [10.0:50]
∅:D[10.50] → [7.109778:109803]
B:BD[7.109778] → [7.109778:109803]
```
        let hash = changes.save_change(&change)?;
        debug!("saved");
```
Deletion in "pijul/src/commands/record.rs" at line 419 [7.101759]
B:BD[11.816] → [11.816:840]
```
            Some(hash),
```

Replacement in "pijul/src/commands/mod.rs" at line 113 [7.133619]

B:BD[12.2740] → [12.2740:2807]

    let hash = repo.changes.save_change(&pending_change).unwrap();

[12.2740]

[13.12750]

    let hash = repo
        .changes
        .save_change(&mut pending_change, |_, _| Ok::<_, anyhow::Error>(()))
        .unwrap();

Replacement in "pijul/src/commands/apply.rs" at line 55 [7.194289]

B:BD[2.1078] → [2.1078:1148]

                    Ok(change) => repo.changes.save_change(&change)?,

[2.1078]

[14.165]

                    Ok(mut change) => repo
                        .changes
                        .save_change(&mut change, |_, _| Ok::<_, anyhow::Error>(()))?,

Replacement in "pijul/src/commands/apply.rs" at line 72 [7.194289]

B:BD[7.195794] → [15.23542:23638]

∅:D[15.23638] → [16.979:1039]

B:BD[7.195886] → [16.979:1039]

            let change = libpijul::change::Change::read(&mut change, &mut HashMap::default())?;
            hashes.push(repo.changes.save_change(&change)?)

[7.195794]

[16.1039]

            let mut change = libpijul::change::Change::read(&mut change, &mut HashMap::default())?;
            hashes.push(
                repo.changes
                    .save_change(&mut change, |_, _| Ok::<_, anyhow::Error>(()))?,
            )

Replacement in "libpijul/src/lib.rs" at line 177 [7.717381]
B:BD[7.724357] → [7.724357:724400]
```
        let change = change::LocalChange {
```
[7.724357]
[7.724400]
```
        let mut change = change::LocalChange {
```
Replacement in "libpijul/src/lib.rs" at line 198 [7.717381]
B:BD[17.28616] → [17.28616:28650]
```
            .save_change(&change)
```
[17.28616]
[17.28650]
```
            .save_change(&mut change, |_, _| Ok(()))
```
Replacement in "libpijul/src/changestore/mod.rs" at line 7 [7.817216]
B:BD[18.4262] → [18.4262:4298]
```
    change::{Change, ChangeHeader},
```
[18.4262]
[18.4298]
```
    change::{Change, ChangeHeader, ChangeError},
```

Replacement in "libpijul/src/changestore/mod.rs" at line 75 [7.817216]

B:BD[17.34077] → [17.34077:34145]

    fn save_change(&self, p: &Change) -> Result<Hash, Self::Error>;

[17.34077]

[17.34145]

    fn save_change<
        E: From<Self::Error> + From<ChangeError>,
        F: FnOnce(&mut Change, &Hash) -> Result<(), E>,
    >(
        &self,
        p: &mut Change,
        f: F,
    ) -> Result<Hash, E>;

Replacement in "libpijul/src/changestore/memory.rs" at line 95 [7.820702]

B:BD[7.823259] → [17.34874:34943]

    fn save_change(&self, p: &Change) -> Result<Hash, Self::Error> {

[7.823259]

[7.823330]

    fn save_change<E: From<Self::Error> + From<ChangeError>, F: FnOnce(&mut Change, &Hash) -> Result<(), E>>(&self, p: &mut Change, f: F) -> Result<Hash, E> {

Replacement in "libpijul/src/changestore/memory.rs" at line 97 [7.820702]

B:BD[7.823381] → [7.823381:823411]

        let hash = p.hash()?;

[7.823381]

[7.823411]

        let hash = p.hash().map_err(|e| Self::Error::from(e))?;
        f(p, &hash)?;

Replacement in "libpijul/src/changestore/filesystem.rs" at line 202 [7.824013]

B:BD[7.830156] → [17.35875:35944]

B:BD[17.35944] → [15.88657:88730]

    fn save_change(&self, p: &Change) -> Result<Hash, Self::Error> {
        let mut f = tempfile::NamedTempFile::new_in(&self.changes_dir)?;

[7.830156]

[7.830302]

    fn save_change<E: From<Self::Error> + From<ChangeError>, F: FnOnce(&mut Change, &Hash) -> Result<(), E>>(&self, p: &mut Change, ff: F) -> Result<Hash, E> {
        let mut f = match tempfile::NamedTempFile::new_in(&self.changes_dir) {
            Ok(f) => f,
            Err(e) => return Err(E::from(Error::from(e)))
        };

Replacement in "libpijul/src/changestore/filesystem.rs" at line 209 [7.824013]
B:BD[7.830376] → [7.830376:830404]
```
            p.serialize(w)?
```
[7.830376]
[7.830404]
```
            p.serialize(w, ff)?
```

Replacement in "libpijul/src/changestore/filesystem.rs" at line 212 [7.824013]

B:BD[7.830461] → [7.830461:830524]

        std::fs::create_dir_all(file_name.parent().unwrap())?;

[7.830461]

[7.830524]

        if let Err(e) = std::fs::create_dir_all(file_name.parent().unwrap()) {
            return Err(E::from(Error::from(e)))
        }

Replacement in "libpijul/src/changestore/filesystem.rs" at line 216 [7.824013]

B:BD[7.830571] → [7.830571:830602]

        f.persist(file_name)?;

[7.830571]

[7.830602]

        if let Err(e) = f.persist(file_name) {
            return Err(E::from(Error::from(e)))
        }

Replacement in "libpijul/src/change.rs" at line 1322 [7.831311]

B:BD[7.870081] → [17.37311:37390]

    pub fn serialize<W: Write>(&self, mut w: W) -> Result<Hash, ChangeError> {

[7.870081]

[7.870244]

    pub fn serialize<W: Write, E: From<ChangeError>, F: FnOnce(&mut Self, &Hash) -> Result<(), E>>(&mut self, mut w: W, f: F) -> Result<Hash, E> {

Replacement in "libpijul/src/change.rs" at line 1325 [7.831311]

B:BD[7.870305] → [7.870305:870366]

        bincode::serialize_into(&mut hashed, &self.hashed)?;

[7.870305]

[7.870416]

        bincode::serialize_into(&mut hashed, &self.hashed).map_err(From::from)?;

Insertion in "libpijul/src/change.rs" at line 1332 [7.831311]
[19.6243]
[7.870599]
```
        f(self, &hash)?;
```

Replacement in "libpijul/src/change.rs" at line 1356 [7.831311]

B:BD[7.871342] → [3.261:323]

        debug!("compressed contents in {:?}", now.elapsed());

[7.871342]

[19.6559]

        debug!("compressed {:?} bytes of contents in {:?}", self.contents.len(), now.elapsed());

Replacement in "libpijul/src/change.rs" at line 1368 [7.831311]

B:BD[7.871477] → [7.871477:871641]

        bincode::serialize_into(&mut w, &offsets)?;
        w.write_all(&hashed_comp)?;
        w.write_all(&unhashed_comp)?;
        w.write_all(&contents_comp)?;

[7.871477]

[7.871641]

        bincode::serialize_into(&mut w, &offsets).map_err(From::from)?;
        w.write_all(&hashed_comp).map_err(From::from)?;
        w.write_all(&unhashed_comp).map_err(From::from)?;
        w.write_all(&contents_comp).map_err(From::from)?;
        debug!("change serialized");

Replacement in "Cargo.lock" at line 2637 [7.1030385]
B:BD[20.62007] → [4.4234:4252]
```
version = "0.2.1"
```
[20.62007]
[20.62025]
```
version = "0.2.2"
```

Replacement in "Cargo.lock" at line 2639 [7.1030385]

B:BD[20.62090] → [4.4253:4331]

checksum = "ac61cc05e3ecc29b17c85b9654271a29babcf1219f3a10ef35494c729e114f99"

[20.62090]

[20.62168]

checksum = "1b8063b34aea161faa6068c9246f98fc033047af5764305ae972e0bc0bf768d4"

Avoid serialising twice in order to save the changes' signatures

Dependencies

In channels

Change contents

Replacement in "pijul/src/commands/record.rs" at line 154 [7.101759]

Deletion in "pijul/src/commands/record.rs" at line 286 [7.101759]

Deletion in "pijul/src/commands/record.rs" at line 414 [7.101759]

Deletion in "pijul/src/commands/record.rs" at line 419 [7.101759]