grahamc/hydra - Change 6NUK6AZAZLOKFHXPS74YV52B63Z4BYQMPY42VAU5ZEACMZ663M2QC

Fix build

Created by Eelco Dolstra on August 4, 2020

6NUK6AZAZLOKFHXPS74YV52B63Z4BYQMPY42VAU5ZEACMZ663M2QC

Dependencies

In channels

upstream

main

Change contents

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 456 [9.530]

B:BD[8.13262] → [8.13262:13376]

                std::string drvPath = job["drvPath"];
                auto drv = readDerivation(*store, drvPath);

[8.13262]

[8.13376]

                auto drvPath = store->parseStorePath((std::string) job["drvPath"]);
                auto drv = store->readDerivation(drvPath);

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 463 [9.530]

B:BD[8.13653] → [8.13653:13943]

                    std::string drvPath2 = (*job2)["drvPath"];
                    auto drv2 = readDerivation(*store, drvPath2);
                    job["constituents"].push_back(drvPath2);
                    drv.inputDrvs[store->parseStorePath(drvPath2)] = {drv2.outputs.begin()->first};

[8.13653]

[8.13943]

                    auto drvPath2 = store->parseStorePath((std::string) (*job2)["drvPath"]);
                    auto drv2 = store->readDerivation(drvPath2);
                    job["constituents"].push_back(store->printStorePath(drvPath2));
                    drv.inputDrvs[drvPath2] = {drv2.outputs.begin()->first};

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 469 [9.530]

B:BD[8.13962] → [8.13962:14038]

                std::string drvName(store->parseStorePath(drvPath).name());

[8.13962]

[8.14038]

                std::string drvName(drvPath.name());

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 475 [9.530]

B:BD[8.14370] → [5.56:147]

                drv.outputs.insert_or_assign("out", DerivationOutput { .path = outPath });

[8.14370]

[8.14466]

                drv.outputs.insert_or_assign("out", DerivationOutput { .output = DerivationOutputInputAddressed { .path = outPath } });

Replacement in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 478 [9.530]

B:BD[8.14562] → [8.14562:14647]

                debug("rewrote aggregate derivation %s -> %s", drvPath, newDrvPath);

[8.14562]

[8.14647]

                debug("rewrote aggregate derivation %s -> %s", store->printStorePath(drvPath), newDrvPath);

Replacement in src/hydra-queue-runner/build-remote.cc at line 263 [11.85]

B:BD[10.1544] → [10.1544:1644]

            Derivation drv2 = readDerivation(*localStore, localStore->printStorePath(input.first));

[10.1544]

[12.1980]

            auto drv2 = localStore->readDerivation(input.first);

Replacement in src/hydra-queue-runner/build-remote.cc at line 265 [11.85]

B:BD[12.2027] → [12.2027:2132]

B:BD[12.2132] → [13.938:1044]

                auto i = drv2.outputs.find(name);
                if (i == drv2.outputs.end()) continue;
                inputs.insert(i->second.path);
                basicDrv.inputSrcs.insert(i->second.path);

[12.2027]

[12.2238]

                if (auto i = get(drv2.outputs, name)) {
                    auto outPath = i->path(*localStore, drv2.name);
                    inputs.insert(outPath);
                    basicDrv.inputSrcs.insert(outPath);
                }

Replacement in src/hydra-queue-runner/build-remote.cc at line 437 [11.85]

B:BD[14.2001] → [10.2649:2702]

            auto outputs = step->drv->outputPaths();

[14.2001]

[15.46]

            auto outputs = step->drv->outputPaths(*localStore);

Replacement in src/hydra-queue-runner/build-result.cc at line 19 [16.441]
B:BD[16.666] → [10.3250:3288]
```
    auto outputs = drv.outputPaths();
```
[16.666]
[10.3288]
```
    auto outputs = drv.outputPaths(*store);
```

Replacement in src/hydra-queue-runner/build-result.cc at line 109 [16.441]

B:BD[16.3446] → [10.3736:3806]

            product.path = store->printStorePath(output.second.path);

[16.3446]

[16.3493]

            auto outPath = output.second.path(*store, drv.name);
            product.path = store->printStorePath(outPath);

Replacement in src/hydra-queue-runner/build-result.cc at line 113 [16.441]
B:BD[16.3606] → [10.3807:3861]
```
            product.name = output.second.path.name();
```
[16.3606]
[16.3664]
```
            product.name = outPath.name();
```
Replacement in src/hydra-queue-runner/build-result.hh at line 15 [16.4329]
B:BD[16.4510] → [6.0:26]
∅:D[6.26] → [16.4546:4570]
B:BD[16.4546] → [16.4546:4570]
```
    nix::Hash sha256hash;
    off_t fileSize = 0;
```
[16.4510]
[16.4570]
```
    std::optional<nix::Hash> sha256hash;
    std::optional<off_t> fileSize;
```

Replacement in src/hydra-queue-runner/builder.cc at line 277 [17.133]

B:BD[17.5815] → [18.4855:4908]

        for (auto & path : step->drv->outputPaths())

[17.5815]

[19.0]

        for (auto & path : step->drv->outputPaths(*localStore))

Replacement in src/hydra-queue-runner/builder.cc at line 466 [17.133]

B:BD[20.3635] → [4.0:61]

                for (auto & path : step->drv->outputPaths())

[20.3635]

[21.653]

                for (auto & path : step->drv->outputPaths(*localStore))

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 263 [16.4840]

B:BD[22.3373] → [21.866:866]

B:BD[21.866] → [21.867:960]

             buildId, stepNr, output.first, localStore->printStorePath(output.second.path));

[22.3373]

[16.9238]

            buildId, stepNr, output.first, localStore->printStorePath(output.second.path(*localStore, step->drv->name)));

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 415 [16.4840]

B:BD[22.5925] → [22.5925:6011]

B:BD[22.6122] → [22.6122:6235]

             product.isRegular ? std::make_optional(product.fileSize) : std::nullopt,
             product.isRegular ? std::make_optional(product.sha256hash.to_string(Base16, false)) : std::nullopt,

[22.5925]

[22.6235]

             product.fileSize ? std::make_optional(*product.fileSize) : std::nullopt,
             product.sha256hash ? std::make_optional(product.sha256hash->to_string(Base16, false)) : std::nullopt,

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 444 [16.4840]
B:BD[23.1390] → [4.139:188]
```
    for (auto & path : step->drv->outputPaths())
```
[23.1390]
[21.1153]
```
    for (auto & path : step->drv->outputPaths(*localStore))
```
Deletion in src/hydra-queue-runner/hydra-queue-runner.cc at line 640 [16.4840]
B:BD[24.1741] → [24.1741:1797]
```
            nested2.attr("putBytes", s3Stats.putBytes);
```

Deletion in src/hydra-queue-runner/hydra-queue-runner.cc at line 641 [16.4840]

B:BD[24.1855] → [24.1855:2019]

∅:D[24.2019] → [25.2830:2854]

B:BD[25.2830] → [25.2830:2854]

            nested2.attr("putSpeed",
                s3Stats.putTimeMs
                ? (double) s3Stats.putBytes / s3Stats.putTimeMs * 1000.0 / (1024.0 * 1024.0)
                : 0.0);

Replacement in src/hydra-queue-runner/nar-extractor.cc at line 42 [7.3248]

B:BD[7.4353] → [7.4353:4416]

    void preallocateContents(unsigned long long size) override

[7.4353]

[7.4416]

    void preallocateContents(uint64_t size) override

Replacement in src/hydra-queue-runner/nar-extractor.cc at line 48 [7.3248]

B:BD[7.4515] → [7.4515:4589]

    void receiveContents(unsigned char * data, unsigned int len) override

[7.4515]

[7.4589]

    void receiveContents(unsigned char * data, size_t len) override

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 179 [17.20067]

B:BD[26.1276] → [4.258:324]

                    for (auto & output : ex.step->drv->outputs) {

[26.1276]

[22.8047]

                    for (auto & output : ex.step->drv->outputPaths(*localStore)) {

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 182 [17.20067]

B:BD[22.8281] → [21.1410:1410]

B:BD[21.1410] → [21.1411:1489]

                             localStore->printStorePath(output.second.path));

[22.8281]

[26.1634]

                             localStore->printStorePath(output));

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 221 [17.20067]

B:BD[17.24863] → [18.7288:7390]

            Derivation drv = readDerivation(*localStore, localStore->printStorePath(build->drvPath));

[17.24863]

[27.0]

            auto drv = localStore->readDerivation(build->drvPath);

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 224 [17.20067]

B:BD[17.24983] → [28.251:301]

            for (auto & path : drv.outputPaths())

[17.24983]

[19.269]

            for (auto & path : drv.outputPaths(*localStore))

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 430 [17.20067]

B:BD[17.31403] → [18.8336:8448]

    step->drv = std::make_unique<Derivation>(readDerivation(*localStore, localStore->printStorePath(drvPath)));

[17.31403]

[13.2046]

    step->drv = std::make_unique<Derivation>(localStore->readDerivation(drvPath));

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 456 [17.20067]
B:BD[17.31904] → [18.8774:8819]
```
    auto outputs = step->drv->outputPaths();
```
[17.31904]
[29.1574]
```
    auto outputs = step->drv->outputPaths(*localStore);
```
Replacement in src/hydra-queue-runner/queue-monitor.cc at line 459 [17.20067]
B:BD[18.8860] → [3.68:68]
∅:D[3.68] → [30.12871:12925]
∅:D[18.8860] → [30.12871:12925]
∅:D[10.9367] → [30.12871:12925]
B:BD[29.1670] → [30.12871:12925]
```
        if (!destStore->isValidPath(i.second.path)) {
```
[18.8860]
[17.31995]
```
        if (!destStore->isValidPath(i.second.path(*localStore, step->drv->name))) {
```

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 470 [17.20067]

B:BD[31.763] → [31.763:852]

            if (/* localStore != destStore && */ localStore->isValidPath(i.second.path))

[31.763]

[31.852]

            auto path = i.second.path(*localStore, step->drv->name);
            if (/* localStore != destStore && */ localStore->isValidPath(path))

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 475 [17.20067]

B:BD[31.962] → [13.2214:2295]

                localStore->querySubstitutablePathInfos({i.second.path}, infos);

[31.962]

[31.1043]

                localStore->querySubstitutablePathInfos({{path, {}}}, infos);

Insertion in src/hydra-queue-runner/queue-monitor.cc at line 484 [17.20067]
[29.2301]
[29.2301]
```
                auto path = i.second.path(*localStore, step->drv->name);
```

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 489 [17.20067]

B:BD[31.1215] → [31.1215:1279]

                    if (localStore->isValidPath(i.second.path))

[31.1215]

[10.9624]

                    if (localStore->isValidPath(path))

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 491 [17.20067]

B:BD[10.9716] → [10.9716:9787]

                            localStore->printStorePath(i.second.path),

[10.9716]

[10.9787]

                            localStore->printStorePath(path),

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 495 [17.20067]

B:BD[18.9427] → [18.9427:9498]

                            localStore->printStorePath(i.second.path),

[18.9427]

[18.9498]

                            localStore->printStorePath(path),

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 497 [17.20067]
B:BD[18.9564] → [3.72:72]
∅:D[3.72] → [31.1528:1591]
∅:D[18.9564] → [31.1528:1591]
∅:D[10.10071] → [31.1528:1591]
B:BD[31.1528] → [31.1528:1591]
```
                        localStore->ensurePath(i.second.path);
```
[18.9564]
[31.1591]
```
                        localStore->ensurePath(path);
```

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 501 [17.20067]

B:BD[31.1700] → [13.2296:2381]

                    copyClosure(ref<Store>(localStore), destStore, {i.second.path});

[31.1700]

[29.2442]

                    copyClosure(ref<Store>(localStore), destStore, {path});

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 508 [17.20067]

B:BD[29.2661] → [29.2661:2773]

                        createSubstitutionStep(txn, startTime, stopTime, build, drvPath, "out", i.second.path);

[29.2661]

[29.2773]

                        createSubstitutionStep(txn, startTime, stopTime, build, drvPath, "out", path);

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 514 [17.20067]

B:BD[10.10260] → [10.10260:10327]

                        localStore->printStorePath(i.second.path),

[10.10260]

[10.10327]

                        localStore->printStorePath(path),

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 620 [17.20067]
B:BD[27.240] → [27.240:280]
```
    for (auto & output : drv.outputs) {
```
[27.240]
[2.0]
```
    for (auto & output : drv.outputPaths(*localStore)) {
```
Replacement in src/hydra-queue-runner/queue-monitor.cc at line 625 [17.20067]
B:BD[22.9180] → [21.1491:1491]
B:BD[21.1491] → [21.1492:1554]
```
             localStore->printStorePath(output.second.path));
```
[22.9180]
[27.585]
```
             localStore->printStorePath(output));
```