max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-29 17:16:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8754 from NixLayeredStore/refactor-store-verify

Browse source 
Refactor `verifyPath` to take `StorePath` instead of `Path`
This commit is contained in:
John Ericson 2023-07-31 12:01:36 -04:00 committed by GitHub
commit dcdd5fed74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1506,10 +1506,10 @@ bool LocalStore::verifyStore(bool checkContents, RepairFlag repair)
printInfo("checking path existence..."); printInfo("checking path existence...");
StorePathSet validPaths; StorePathSet validPaths;
PathSet done; StorePathSet done;
for (auto & i : queryAllValidPaths()) for (auto & i : queryAllValidPaths())
verifyPath(printStorePath(i), store, done, validPaths, repair, errors); verifyPath(i, store, done, validPaths, repair, errors);
/* Optionally, check the content hashes (slow). */ /* Optionally, check the content hashes (slow). */
if (checkContents) { if (checkContents) {
@ -1595,19 +1595,12 @@ bool LocalStore::verifyStore(bool checkContents, RepairFlag repair)
} }
void LocalStore::verifyPath(const Path & pathS, const StringSet & store, void LocalStore::verifyPath(const StorePath & path, const StringSet & store,
PathSet & done, StorePathSet & validPaths, RepairFlag repair, bool & errors) StorePathSet & done, StorePathSet & validPaths, RepairFlag repair, bool & errors)
{ {
checkInterrupt(); checkInterrupt();
if (!done.insert(pathS).second) return; if (!done.insert(path).second) return;
if (!isStorePath(pathS)) {
printError("path '%s' is not in the Nix store", pathS);
return;
}
auto path = parseStorePath(pathS);
if (!store.count(std::string(path.to_string()))) { if (!store.count(std::string(path.to_string()))) {
/* Check any referrers first. If we can invalidate them /* Check any referrers first. If we can invalidate them
@ -1616,11 +1609,13 @@ void LocalStore::verifyPath(const Path & pathS, const StringSet & store,
StorePathSet referrers; queryReferrers(path, referrers); StorePathSet referrers; queryReferrers(path, referrers);
for (auto & i : referrers) for (auto & i : referrers)
if (i != path) { if (i != path) {
verifyPath(printStorePath(i), store, done, validPaths, repair, errors); verifyPath(i, store, done, validPaths, repair, errors);
if (validPaths.count(i)) if (validPaths.count(i))
canInvalidate = false; canInvalidate = false;
} }
auto pathS = printStorePath(path);
if (canInvalidate) { if (canInvalidate) {
printInfo("path '%s' disappeared, removing from database...", pathS); printInfo("path '%s' disappeared, removing from database...", pathS);
auto state(_state.lock()); auto state(_state.lock());

4
src/libstore/local-store.hh
View file

@ -314,8 +314,8 @@ private:
*/ */
void invalidatePathChecked(const StorePath & path); void invalidatePathChecked(const StorePath & path);
void verifyPath(const Path & path, const StringSet & store, void verifyPath(const StorePath & path, const StringSet & store,
PathSet & done, StorePathSet & validPaths, RepairFlag repair, bool & errors); StorePathSet & done, StorePathSet & validPaths, RepairFlag repair, bool & errors);
std::shared_ptr<const ValidPathInfo> queryPathInfoInternal(State & state, const StorePath & path); std::shared_ptr<const ValidPathInfo> queryPathInfoInternal(State & state, const StorePath & path);