wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-02 05:11:47 +02:00
Code Activity

refactor: Un-callback transform Store::queryPathInfoFromClientCache

Browse source 
This part of the code was not necessarily callback based.
Removing CPS is always nice; particularly if there's no loss of
functionality, like here.
This commit is contained in:
Robert Hensing 2024-01-17 17:54:03 +01:00
parent d0a284284b
commit 8983ee8b2e
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/libstore/store-api.cc
View file

@ -685,8 +685,7 @@ static bool goodStorePath(const StorePath & expected, const StorePath & actual)
&& (expected.name() == Store::MissingName || expected.name() == actual.name());
}
bool Store::queryPathInfoFromClientCache(const StorePath & storePath,
Callback<ref<const ValidPathInfo>> & callback)
std::optional<ref<const ValidPathInfo>> Store::queryPathInfoFromClientCache(const StorePath & storePath)
{
auto hashPart = std::string(storePath.hashPart());
@ -696,8 +695,7 @@ bool Store::queryPathInfoFromClientCache(const StorePath & storePath,
stats.narInfoReadAverted++;
if (!res->didExist())
throw InvalidPath("path '%s' is not valid", printStorePath(storePath));
callback(ref<const ValidPathInfo>(res->value));
return true;
return ref(res->value);
}
}
@ -713,12 +711,11 @@ bool Store::queryPathInfoFromClientCache(const StorePath & storePath,
!goodStorePath(storePath, res.second->path))
throw InvalidPath("path '%s' is not valid", printStorePath(storePath));
}
callback(ref<const ValidPathInfo>(res.second));
return true;
return ref(res.second);
}
}
return false;
return std::nullopt;
}
@ -728,8 +725,11 @@ void Store::queryPathInfo(const StorePath & storePath,
auto hashPart = std::string(storePath.hashPart());
try {
if (queryPathInfoFromClientCache(storePath, callback))
return;
auto r = queryPathInfoFromClientCache(storePath);
if (r.has_value()) {
ref<const ValidPathInfo> & info = *r;
return callback(ref(info));
}
} catch (...) { return callback.rethrow(); }
auto callbackPtr = std::make_shared<decltype(callback)>(std::move(callback));