grahamc/hydra - Change W7OCNTLFXNRGEHMQ5WBX4Z2Q6II3APKTLNWH76ZYZNRZDEVQACLAC

Fix build with latest Nix

Recently a few internal APIs have changed[1]. The outputPaths function has been removed and a lot of data structures are modeled with std::optional which broke compilation.

This patch updates the code in hydra-queue-runner accordingly to make sure that Hydra compiles again.

[1] https://github.com/NixOS/nix/pull/3883

Created by Maximilian Bosch on September 26, 2020

W7OCNTLFXNRGEHMQ5WBX4Z2Q6II3APKTLNWH76ZYZNRZDEVQACLAC

Dependencies

In channels

upstream

main

Change contents

Insertion in src/hydra-eval-jobs/hydra-eval-jobs.cc at line 3 [3.530]
[3.566]
[3.623]
```
#include <thread>
```

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

B:BD[2.886] → [2.886:1054]

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

[2.886]

[2.1054]

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

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

B:BD[5.2001] → [2.1073:1137]

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

[5.2001]

[6.46]

            StorePathSet outputs;
            for (auto & i : step->drv->outputsAndOptPaths(*localStore)) {
                if (i.second.second)
                   outputs.insert(*i.second.second);
            }

Replacement in src/hydra-queue-runner/build-result.cc at line 19 [7.441]
B:BD[7.666] → [2.1138:1182]
```
    auto outputs = drv.outputPaths(*store);
```
[7.666]
[8.3288]
```
    StorePathSet outputs;
```

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

∅:D[9.2807] → [7.790:824]

∅:D[8.3314] → [7.790:824]

B:BD[7.790] → [7.790:824]

B:BD[7.824] → [10.1303:1353]

    for (auto & output : outputs)
        store->computeFSClosure(output, closure);

[8.3314]

[7.875]

    for (auto & i : drv.outputsAndOptPaths(*store))
        if (i.second.second) {
            store->computeFSClosure(*i.second.second, closure);
            outputs.insert(*i.second.second);
        }

Replacement in src/hydra-queue-runner/build-result.cc at line 110 [7.441]
B:BD[7.3368] → [7.3368:3412]
```
        for (auto & output : drv.outputs) {
```
[7.3368]
[7.3412]
```
        for (auto & [name, output] : drv.outputs) {
```

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

B:BD[7.3446] → [2.1183:1307]

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

[7.3446]

[7.3493]

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

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

B:BD[7.3533] → [7.3533:3606]

B:BD[7.3606] → [2.1308:1351]

            product.subtype = output.first == "out" ? "" : output.first;
            product.name = outPath.name();

[7.3533]

[7.3664]

            product.subtype = name == "out" ? "" : name;
            product.name = outPath->name();

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

B:BD[11.5815] → [2.1429:1493]

∅:D[2.1493] → [12.0:27]

∅:D[9.4908] → [12.0:27]

∅:D[8.5415] → [12.0:27]

B:BD[13.52] → [12.0:27]

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

[11.5815]

[13.114]

        for (auto & i : step->drv->outputsAndOptPaths(*localStore)) {
            if (i.second.second)
               addRoot(*i.second.second);
        }

Replacement in src/hydra-queue-runner/builder.cc at line 468 [11.133]

B:BD[14.3635] → [2.1494:1566]

∅:D[15.61] → [16.653:764]

∅:D[2.1566] → [16.653:764]

B:BD[16.653] → [16.653:764]

                for (auto & path : step->drv->outputPaths(*localStore))
                    txn.exec_params0("insert into FailedPaths values ($1)", localStore->printStorePath(path));

[14.3635]

[14.3815]

                for (auto & i : step->drv->outputsAndOptPaths(*localStore))
                    if (i.second.second)
                       txn.exec_params0("insert into FailedPaths values ($1)", localStore->printStorePath(*i.second.second));

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 259 [7.4840]
B:BD[7.8997] → [15.93:138]
```
    for (auto & output : step->drv->outputs)
```
[7.8997]
[17.3251]
```
    for (auto & [name, output] : step->drv->outputs)
```

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 262 [7.4840]

B:BD[17.3373] → [2.1567:1689]

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

[17.3373]

[7.9238]

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

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 443 [7.4840]

B:BD[18.1390] → [2.1892:1952]

∅:D[15.188] → [16.1153:1270]

∅:D[2.1952] → [16.1153:1270]

B:BD[16.1153] → [16.1153:1270]

B:BD[16.1270] → [19.44:44]

∅:D[19.44] → [18.1535:1560]

∅:D[16.1270] → [18.1535:1560]

∅:D[9.6557] → [18.1535:1560]

∅:D[17.6972] → [18.1535:1560]

∅:D[20.6999] → [18.1535:1560]

∅:D[8.7064] → [18.1535:1560]

B:BD[18.1535] → [18.1535:1560]

    for (auto & path : step->drv->outputPaths(*localStore))
        if (!txn.exec_params("select 1 from FailedPaths where path = $1", localStore->printStorePath(path)).empty())
            return true;

[18.1390]

[18.1560]

    for (auto & i : step->drv->outputsAndOptPaths(*localStore))
        if (i.second.second)
            if (!txn.exec_params("select 1 from FailedPaths where path = $1", localStore->printStorePath(*i.second.second)).empty())
                return true;

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

B:BD[21.1276] → [2.2076:2159]

∅:D[15.324] → [17.8047:8281]

∅:D[16.1408] → [17.8047:8281]

∅:D[2.2159] → [17.8047:8281]

B:BD[21.1341] → [17.8047:8281]

B:BD[17.8281] → [2.2160:2226]

∅:D[16.1489] → [21.1634:1791]

∅:D[2.2226] → [21.1634:1791]

∅:D[9.7287] → [21.1634:1791]

∅:D[8.7794] → [21.1634:1791]

∅:D[17.8331] → [21.1634:1791]

B:BD[21.1634] → [21.1634:1791]

                    for (auto & output : ex.step->drv->outputPaths(*localStore)) {
                        auto res = txn.exec_params
                            ("select max(s.build) from BuildSteps s join BuildStepOutputs o on s.build = o.build where path = $1 and startTime != 0 and stopTime != 0 and status = 1",
                             localStore->printStorePath(output));
                        if (!res[0][0].is_null()) {
                            propagatedFrom = res[0][0].as<BuildID>();
                            break;

[21.1276]

[21.1791]

                    for (auto & i : ex.step->drv->outputsAndOptPaths(*localStore)) {
                        if (i.second.second) {
                            auto res = txn.exec_params
                                ("select max(s.build) from BuildSteps s join BuildStepOutputs o on s.build = o.build where path = $1 and startTime != 0 and stopTime != 0 and status = 1",
                                 localStore->printStorePath(*i.second.second));
                            if (!res[0][0].is_null()) {
                                propagatedFrom = res[0][0].as<BuildID>();
                                break;
                            }

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 226 [11.20067]

B:BD[11.24983] → [2.2295:2356]

∅:D[2.2356] → [12.269:300]

B:BD[13.301] → [12.269:300]

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

[11.24983]

[13.367]

            for (auto & i : drv.outputsAndOptPaths(*localStore))
                if (i.second.second)
                    addRoot(*i.second.second);

Deletion in src/hydra-queue-runner/queue-monitor.cc at line 459 [11.20067]
B:BD[11.31904] → [2.2441:2497]
```
    auto outputs = step->drv->outputPaths(*localStore);
```

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 461 [11.20067]

B:BD[9.8860] → [2.2498:2582]

        if (!destStore->isValidPath(i.second.path(*localStore, step->drv->name))) {

[9.8860]

[11.31995]

        if (!destStore->isValidPath(*i.second.path(*localStore, step->drv->name, i.first))) {

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 472 [11.20067]

B:BD[22.763] → [2.2583:2732]

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

[22.763]

[22.852]

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

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 477 [11.20067]

B:BD[22.962] → [2.2733:2811]

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

[22.962]

[22.1043]

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

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 486 [11.20067]

B:BD[23.2301] → [2.2812:2885]

                auto path = i.second.path(*localStore, step->drv->name);

[23.2301]

[2.2885]

                auto path = i.second.path(*localStore, step->drv->name, i.first);

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

B:BD[22.1215] → [2.2887:2942]

                    if (localStore->isValidPath(path))

[22.1215]

[8.9624]

                    if (localStore->isValidPath(*path))

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 493 [11.20067]

B:BD[8.9716] → [2.2943:3005]

                            localStore->printStorePath(path),

[8.9716]

[8.9787]

                            localStore->printStorePath(*path),

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 497 [11.20067]

B:BD[9.9427] → [2.3006:3068]

                            localStore->printStorePath(path),

[9.9427]

[9.9498]

                            localStore->printStorePath(*path),

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 499 [11.20067]

B:BD[9.9564] → [2.3069:3123]

                        localStore->ensurePath(path);

[9.9564]

[22.1591]

                        localStore->ensurePath(*path);

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 503 [11.20067]

B:BD[22.1700] → [2.3124:3200]

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

[22.1700]

[23.2442]

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

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 510 [11.20067]

B:BD[23.2661] → [2.3201:3304]

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

[23.2661]

[23.2773]

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

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 516 [11.20067]

B:BD[8.10260] → [2.3305:3363]

                        localStore->printStorePath(path),

[8.10260]

[8.10327]

                        localStore->printStorePath(*path),

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 622 [11.20067]

B:BD[24.240] → [2.3364:3421]

    for (auto & output : drv.outputPaths(*localStore)) {

[24.240]

[25.0]

    for (auto & [name, output] : drv.outputsAndOptPaths(*localStore)) {

Replacement in src/hydra-queue-runner/queue-monitor.cc at line 627 [11.20067]

B:BD[17.9180] → [2.3422:3472]

             localStore->printStorePath(output));

[17.9180]

[24.585]

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