mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

querySubstitutablePaths(): Don't query paths for which we already have a substituter

Browse source
This commit is contained in:
Eelco Dolstra 2016-10-07 19:57:47 +02:00
parent 0c85ef7090
commit edf9eb8181
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/libstore/local-store.cc
View file

@ -781,14 +781,27 @@ Path LocalStore::queryPathFromHashPart(const string & hashPart)
PathSet LocalStore::querySubstitutablePaths(const PathSet & paths) PathSet LocalStore::querySubstitutablePaths(const PathSet & paths)
{ {
if (!settings.useSubstitutes) return PathSet(); if (!settings.useSubstitutes) return PathSet();
auto remaining = paths;
PathSet res; PathSet res;
for (auto & sub : getDefaultSubstituters()) { for (auto & sub : getDefaultSubstituters()) {
if (res.size() == paths.size()) break; if (remaining.empty()) break;
if (sub->storeDir != storeDir) continue; if (sub->storeDir != storeDir) continue;
if (!sub->wantMassQuery()) continue; if (!sub->wantMassQuery()) continue;
for (auto path : sub->queryValidPaths(paths))
res.insert(path); auto valid = sub->queryValidPaths(remaining);
PathSet remaining2;
for (auto & path : remaining)
if (valid.count(path))
res.insert(path);
else
remaining2.insert(path);
std::swap(remaining, remaining2);
} }
return res; return res;
} }