lix-project/lix
20
57
Fork 31
Code Issues 348 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Revive the flake cache

Browse source 
Not that it matters a lot anymore - we respect lock files of inputs
now, so we're doing a lot fewer flake lookups.
This commit is contained in:
Eelco Dolstra 2020-01-29 21:10:27 +01:00
parent 26f895a26d
commit 68e0ca608f
1 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/libexpr/flake/flake.cc
View file

@ -31,22 +31,20 @@ static FlakeRef maybeLookupFlake(
return flakeRef; return flakeRef;
} }
typedef std::vector<std::pair<FlakeRef, FlakeRef>> RefMap; typedef std::vector<std::pair<FlakeRef, FlakeRef>> FlakeCache;
static FlakeRef lookupInRefMap( static FlakeRef lookupInFlakeCache(
const RefMap & refMap, const FlakeCache & flakeCache,
const FlakeRef & flakeRef) const FlakeRef & flakeRef)
{ {
#if 0
// FIXME: inefficient. // FIXME: inefficient.
for (auto & i : refMap) { for (auto & i : flakeCache) {
if (flakeRef.contains(i.first)) { if (flakeRef == i.first) {
debug("mapping '%s' to previously seen input '%s' -> '%s", debug("mapping '%s' to previously seen input '%s' -> '%s",
flakeRef, i.first, i.second); flakeRef, i.first, i.second);
return i.second; return i.second;
} }
} }
#endif
return flakeRef; return flakeRef;
} }
@ -122,11 +120,11 @@ static std::map<FlakeId, FlakeInput> parseFlakeInputs(
} }
static Flake getFlake(EvalState & state, const FlakeRef & originalRef, static Flake getFlake(EvalState & state, const FlakeRef & originalRef,
bool allowLookup, RefMap & refMap) bool allowLookup, FlakeCache & flakeCache)
{ {
auto flakeRef = lookupInRefMap(refMap, auto flakeRef = lookupInFlakeCache(flakeCache,
maybeLookupFlake(state, maybeLookupFlake(state,
lookupInRefMap(refMap, originalRef), allowLookup)); lookupInFlakeCache(flakeCache, originalRef), allowLookup));
auto [sourceInfo, resolvedInput] = flakeRef.input->fetchTree(state.store); auto [sourceInfo, resolvedInput] = flakeRef.input->fetchTree(state.store);
@ -135,8 +133,8 @@ static Flake getFlake(EvalState & state, const FlakeRef & originalRef,
debug("got flake source '%s' from '%s'", debug("got flake source '%s' from '%s'",
state.store->printStorePath(sourceInfo.storePath), resolvedRef); state.store->printStorePath(sourceInfo.storePath), resolvedRef);
refMap.push_back({originalRef, resolvedRef}); flakeCache.push_back({originalRef, resolvedRef});
refMap.push_back({flakeRef, resolvedRef}); flakeCache.push_back({flakeRef, resolvedRef});
if (state.allowedPaths) if (state.allowedPaths)
state.allowedPaths->insert(sourceInfo.actualPath); state.allowedPaths->insert(sourceInfo.actualPath);
@ -221,19 +219,19 @@ static Flake getFlake(EvalState & state, const FlakeRef & originalRef,
Flake getFlake(EvalState & state, const FlakeRef & originalRef, bool allowLookup) Flake getFlake(EvalState & state, const FlakeRef & originalRef, bool allowLookup)
{ {
RefMap refMap; FlakeCache flakeCache;
return getFlake(state, originalRef, allowLookup, refMap); return getFlake(state, originalRef, allowLookup, flakeCache);
} }
static std::pair<fetchers::Tree, FlakeRef> getNonFlake( static std::pair<fetchers::Tree, FlakeRef> getNonFlake(
EvalState & state, EvalState & state,
const FlakeRef & originalRef, const FlakeRef & originalRef,
bool allowLookup, bool allowLookup,
RefMap & refMap) FlakeCache & flakeCache)
{ {
auto flakeRef = lookupInRefMap(refMap, auto flakeRef = lookupInFlakeCache(flakeCache,
maybeLookupFlake(state, maybeLookupFlake(state,
lookupInRefMap(refMap, originalRef), allowLookup)); lookupInFlakeCache(flakeCache, originalRef), allowLookup));
auto [sourceInfo, resolvedInput] = flakeRef.input->fetchTree(state.store); auto [sourceInfo, resolvedInput] = flakeRef.input->fetchTree(state.store);
@ -242,8 +240,8 @@ static std::pair<fetchers::Tree, FlakeRef> getNonFlake(
debug("got non-flake source '%s' from '%s'", debug("got non-flake source '%s' from '%s'",
state.store->printStorePath(sourceInfo.storePath), resolvedRef); state.store->printStorePath(sourceInfo.storePath), resolvedRef);
refMap.push_back({originalRef, resolvedRef}); flakeCache.push_back({originalRef, resolvedRef});
refMap.push_back({flakeRef, resolvedRef}); flakeCache.push_back({flakeRef, resolvedRef});
if (state.allowedPaths) if (state.allowedPaths)
state.allowedPaths->insert(sourceInfo.actualPath); state.allowedPaths->insert(sourceInfo.actualPath);
@ -304,9 +302,9 @@ LockedFlake lockFlake(
{ {
settings.requireExperimentalFeature("flakes"); settings.requireExperimentalFeature("flakes");
RefMap refMap; FlakeCache flakeCache;
auto flake = getFlake(state, topRef, lockFlags.useRegistries, refMap); auto flake = getFlake(state, topRef, lockFlags.useRegistries, flakeCache);
LockFile oldLockFile; LockFile oldLockFile;
@ -428,7 +426,7 @@ LockedFlake lockFlake(
if (input.isFlake) { if (input.isFlake) {
auto inputFlake = getFlake(state, input.ref, auto inputFlake = getFlake(state, input.ref,
lockFlags.useRegistries, refMap); lockFlags.useRegistries, flakeCache);
newLocks.inputs.insert_or_assign(id, newLocks.inputs.insert_or_assign(id,
LockedInput(inputFlake.resolvedRef, inputFlake.originalRef, inputFlake.sourceInfo->narHash)); LockedInput(inputFlake.resolvedRef, inputFlake.originalRef, inputFlake.sourceInfo->narHash));
@ -448,7 +446,7 @@ LockedFlake lockFlake(
else { else {
auto [sourceInfo, resolvedRef] = getNonFlake(state, input.ref, auto [sourceInfo, resolvedRef] = getNonFlake(state, input.ref,
lockFlags.useRegistries, refMap); lockFlags.useRegistries, flakeCache);
newLocks.inputs.insert_or_assign(id, newLocks.inputs.insert_or_assign(id,
LockedInput(resolvedRef, input.ref, sourceInfo.narHash)); LockedInput(resolvedRef, input.ref, sourceInfo.narHash));
} }
@ -563,8 +561,8 @@ static void prim_callFlake(EvalState & state, const Pos & pos, Value * * args, V
callFlake(state, flake, lazyInput->lockedInput, v); callFlake(state, flake, lazyInput->lockedInput, v);
} else { } else {
RefMap refMap; FlakeCache flakeCache;
auto [sourceInfo, resolvedRef] = getNonFlake(state, lazyInput->lockedInput.ref, false, refMap); auto [sourceInfo, resolvedRef] = getNonFlake(state, lazyInput->lockedInput.ref, false, flakeCache);
if (sourceInfo.narHash != lazyInput->lockedInput.narHash) if (sourceInfo.narHash != lazyInput->lockedInput.narHash)
throw Error("the content hash of repository '%s' doesn't match the hash recorded in the referring lockfile", throw Error("the content hash of repository '%s' doesn't match the hash recorded in the referring lockfile",