grahamc/hydra - Change 3FQ65IXOIAWKEV67IXY7WRUX4OGMDYRA3RZJ2XPZ42AZXUANQ74QC

hydra-queue-runner: Compress binary cache NARs using xz

Created by Eelco Dolstra on February 15, 2016

3FQ65IXOIAWKEV67IXY7WRUX4OGMDYRA3RZJ2XPZ42AZXUANQ74QC

Dependencies

[2] 73YR46NJNYZQKHA3QDJCAZYAKC2CGEF5LIS44NOIPDZU6FX6BDPQC

In channels

main

upstream

Change contents

Insertion in src/hydra-queue-runner/local-binary-cache.cc at line 4 [2.1879]
[2.1936]
[2.1936]
```
#include "compression.hh"
```

Insertion in src/hydra-queue-runner/local-binary-cache.cc at line 36 [2.1879]

[2.2806]

    Path narInfoFile = narInfoFileFor(info.path);
    if (pathExists(narInfoFile)) return;

Insertion in src/hydra-queue-runner/local-binary-cache.cc at line 47 [2.1879]

[2.3170]


    /* Compress the NAR. */
    string narXz = compressXZ(nar);
    Hash narXzHash = hashString(htSHA256, narXz);

Replacement in src/hydra-queue-runner/local-binary-cache.cc at line 53 [2.1879]

B:BD[2.3212] → [2.3212:3274]

    string narFileRel = "nar/" + printHash(narHash) + ".nar";

[2.3212]

[2.3274]

    string narFileRel = "nar/" + printHash32(narXzHash) + ".nar.xz";

Replacement in src/hydra-queue-runner/local-binary-cache.cc at line 55 [2.1879]
B:BD[2.3328] → [2.3328:3385]
```
    if (!pathExists(narFile)) atomicWrite(narFile, nar);
```
[2.3328]
[2.3385]
```
    if (!pathExists(narFile)) atomicWrite(narFile, narXz);
```

Replacement in src/hydra-queue-runner/local-binary-cache.cc at line 58 [2.1879]

B:BD[2.3431] → [2.3431:3481]

    Path narInfoFile = narInfoFileFor(info.path);

[2.3431]

[2.3481]

    Strings refs;
    for (auto & r : info.references)
        refs.push_back(baseNameOf(r));

Replacement in src/hydra-queue-runner/local-binary-cache.cc at line 62 [2.1879]

B:BD[2.3482] → [2.3482:3518]

    if (!pathExists(narInfoFile)) {

[2.3482]

[2.3518]

    std::string narInfo;
    narInfo += "StorePath: " + info.path + "\n";
    narInfo += "URL: " + narFileRel + "\n";
    narInfo += "Compression: xz\n";
    narInfo += "FileHash: sha256:" + printHash32(narXzHash) + "\n";
    narInfo += "FileSize: " + std::to_string(narXz.size()) + "\n";
    narInfo += "NarHash: sha256:" + printHash32(narHash) + "\n";
    narInfo += "NarSize: " + std::to_string(narSize) + "\n";
    narInfo += "References: " + concatStringsSep(" ", refs) + "\n";

Replacement in src/hydra-queue-runner/local-binary-cache.cc at line 72 [2.1879]

B:BD[2.3519] → [2.3519:4136]

        Strings refs;
        for (auto & r : info.references)
            refs.push_back(baseNameOf(r));
        std::string narInfo;
        narInfo += "StorePath: " + info.path + "\n";
        narInfo += "URL: " + narFileRel + "\n";
        narInfo += "Compression: none\n";
        narInfo += "FileHash: sha256:" + printHash(narHash) + "\n";
        narInfo += "FileSize: " + std::to_string(narSize) + "\n";
        narInfo += "NarHash: sha256:" + printHash(narHash) + "\n";
        narInfo += "NarSize: " + std::to_string(narSize) + "\n";
        narInfo += "References: " + concatStringsSep(" ", refs) + "\n";

[2.3519]

[2.4136]

    // FIXME: add signature

Replacement in src/hydra-queue-runner/local-binary-cache.cc at line 74 [2.1879]

B:BD[2.4137] → [2.4137:4219]

        // FIXME: add signature
        atomicWrite(narInfoFile, narInfo);
    }

[2.4137]

[2.4219]

    atomicWrite(narInfoFile, narInfo);

Insertion in src/hydra-queue-runner/local-binary-cache.cc at line 117 [2.1879]

[2.5476]

        else if (name == "Compression") {
            res.compression = value;
        }

Insertion in src/hydra-queue-runner/local-binary-cache.cc at line 145 [2.1879]

[2.6028]


    /* Decompress the NAR. FIXME: would be nice to have the remote
       side do this. */
    if (res.compression == "none")
        ;
    else if (res.compression == "xz")
        nar = decompressXZ(nar);
    else
        throw Error(format("unknown NAR compression type ‘%1%’") % nar);

Insertion in src/hydra-queue-runner/local-binary-cache.hh at line 27 [2.9253]
[2.9712]
[2.9712]
```
        std::string compression = "none";
```