wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 12:41:15 +02:00
Code Activity

Hacky fast closure copying mechanism

Browse source
This commit is contained in:
Eelco Dolstra 2021-06-29 21:17:48 +02:00
parent bef40c2949
commit 3d9de41a5b
6 changed files with 55 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/libcmd/installables.cc
View file

@ -12,6 +12,7 @@
#include "eval-cache.hh"
#include "url.hh"
#include "registry.hh"
#include "remote-store.hh"
#include <regex>
#include <queue>
@ -378,6 +379,7 @@ DerivedPaths InstallableValue::toDerivedPaths()
DerivedPaths res;
std::map<StorePath, std::set<std::string>> drvsToOutputs;
RealisedPath::Set drvsToCopy;
// Group by derivation, helps with .all in particular
for (auto & drv : toDerivations()) {
@ -385,11 +387,38 @@ DerivedPaths InstallableValue::toDerivedPaths()
if (outputName == "")
throw Error("derivation '%s' lacks an 'outputName' attribute", state->store->printStorePath(drv.drvPath));
drvsToOutputs[drv.drvPath].insert(outputName);
drvsToCopy.insert(drv.drvPath);
}
for (auto & i : drvsToOutputs)
res.push_back(DerivedPath::Built { i.first, i.second });
// FIXME: Temporary hack
if (state->store != state->buildStore) {
RealisedPath::Set closure;
RealisedPath::closure(*state->store, drvsToCopy, closure);
if (dynamic_cast<RemoteStore *>(&*state->buildStore)) {
StorePathSet closure2;
for (auto & p : closure)
closure2.insert(p.path());
auto valid = state->buildStore->queryValidPaths(closure2);
StorePathSet missing;
for (auto & p : closure2)
if (!valid.count(p)) missing.insert(p);
if (!missing.empty()) {
auto source = sinkToSource([&](Sink & sink) {
state->store->exportPaths(missing, sink);
});
state->buildStore->importPaths(*source, NoCheckSigs);
}
} else
copyPaths(state->store, state->buildStore, closure);
}
return res;
}