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

local-store verifying: Rename store to something more clear

Browse source 
It is not a `Store` but a `StorePathSet`.
This commit is contained in:
John Ericson 2023-08-02 12:40:04 -04:00
parent 6525265f46
commit 770d50e49c
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1502,10 +1502,10 @@ bool LocalStore::verifyStore(bool checkContents, RepairFlag repair)
StorePathSet validPaths; StorePathSet validPaths;
{ {
StorePathSet store; StorePathSet storePathsInStoreDir;
for (auto & i : readDirectory(realStoreDir)) { for (auto & i : readDirectory(realStoreDir)) {
try { try {
store.insert({i.name}); storePathsInStoreDir.insert({i.name});
} catch (BadStorePath &) { } } catch (BadStorePath &) { }
} }
@ -1515,7 +1515,7 @@ bool LocalStore::verifyStore(bool checkContents, RepairFlag repair)
StorePathSet done; StorePathSet done;
for (auto & i : queryAllValidPaths()) for (auto & i : queryAllValidPaths())
verifyPath(i, store, done, validPaths, repair, errors); verifyPath(i, storePathsInStoreDir, done, validPaths, repair, errors);
} }
/* Optionally, check the content hashes (slow). */ /* Optionally, check the content hashes (slow). */
@ -1602,21 +1602,21 @@ bool LocalStore::verifyStore(bool checkContents, RepairFlag repair)
} }
void LocalStore::verifyPath(const StorePath & path, const StorePathSet & store, void LocalStore::verifyPath(const StorePath & path, const StorePathSet & storePathsInStoreDir,
StorePathSet & done, StorePathSet & validPaths, RepairFlag repair, bool & errors) StorePathSet & done, StorePathSet & validPaths, RepairFlag repair, bool & errors)
{ {
checkInterrupt(); checkInterrupt();
if (!done.insert(path).second) return; if (!done.insert(path).second) return;
if (!store.count(path)) { if (!storePathsInStoreDir.count(path)) {
/* Check any referrers first. If we can invalidate them /* Check any referrers first. If we can invalidate them
first, then we can invalidate this path as well. */ first, then we can invalidate this path as well. */
bool canInvalidate = true; bool canInvalidate = true;
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(i, store, done, validPaths, repair, errors); verifyPath(i, storePathsInStoreDir, done, validPaths, repair, errors);
if (validPaths.count(i)) if (validPaths.count(i))
canInvalidate = false; canInvalidate = false;
} }