nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-26 04:00:59 +01:00
Code Activity

New state queries for nix-store now work:

Browse source 
--requisites / -R: print all paths necessary to realise a path
--requisites-withstate: same as --requisites but now also including state paths
--references: print all paths referenced by the given path
--references-state: print all state paths referenced by the given path  
--referrers: print all paths directly refering to the given path
--referrers-state: print all state paths directly refering to the given path
--referrers-closure: print all paths (in)directly refering to the given path
--referrers-closure-withstate: same as --referrers-closure but now also including state paths
This commit is contained in:
Wouter den Breejen 2007-06-22 14:59:03 +00:00
parent 6351b7e728
commit c0dcfed3c3
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -350,6 +350,10 @@ static bool isRealisablePath(const Transaction & txn, const Path & path)
return isValidPathTxn(txn, path) || readSubstitutes(txn, path).size() > 0; return isValidPathTxn(txn, path) || readSubstitutes(txn, path).size() > 0;
} }
static bool isRealisableComponentOrStatePath(const Transaction & txn, const Path & path)
{
return isValidComponentOrStatePathTxn(txn, path) || readSubstitutes(txn, path).size() > 0; //TODO State paths are not yet in substitutes !!!!!!!!!!!!!!
}
static string addPrefix(const string & prefix, const string & s) static string addPrefix(const string & prefix, const string & s)
{ {
@ -440,8 +444,8 @@ void queryReferences(const Transaction & txn,
{ {
Paths references2; Paths references2;
if (!isRealisablePath(txn, storePath)) if (!isRealisableComponentOrStatePath(txn, storePath))
throw Error(format("path `%1%' is not valid") % storePath); throw Error(format("path `%1%' is not valid 1") % storePath);
nixDB.queryStrings(txn, dbReferences, storePath, references2); nixDB.queryStrings(txn, dbReferences, storePath, references2);
references.insert(references2.begin(), references2.end()); references.insert(references2.begin(), references2.end());
} }
@ -458,8 +462,8 @@ void queryStateReferences(const Transaction & txn,
{ {
Paths stateReferences2; Paths stateReferences2;
if (!isRealisablePath(txn, storePath)) if (!isRealisableComponentOrStatePath(txn, storePath))
throw Error(format("path `%1%' is not valid") % storePath); throw Error(format("path `%1%' is not valid 2") % storePath);
nixDB.queryStrings(txn, dbStateReferences, storePath, stateReferences2); nixDB.queryStrings(txn, dbStateReferences, storePath, stateReferences2);
stateReferences.insert(stateReferences2.begin(), stateReferences2.end()); stateReferences.insert(stateReferences2.begin(), stateReferences2.end());
} }
@ -472,7 +476,7 @@ void LocalStore::queryStateReferences(const Path & storePath, PathSet & stateRef
void queryReferrers(const Transaction & txn, void queryReferrers(const Transaction & txn,
const Path & storePath, PathSet & referrers) const Path & storePath, PathSet & referrers)
{ {
if (!isRealisablePath(txn, storePath)) if (!isRealisableComponentOrStatePath(txn, storePath))
throw Error(format("path `%1%' is not valid") % storePath); throw Error(format("path `%1%' is not valid") % storePath);
PathSet referrers2 = getReferrers(txn, storePath); PathSet referrers2 = getReferrers(txn, storePath);
referrers.insert(referrers2.begin(), referrers2.end()); referrers.insert(referrers2.begin(), referrers2.end());
@ -488,7 +492,7 @@ void LocalStore::queryReferrers(const Path & storePath,
void queryStateReferrers(const Transaction & txn, const Path & storePath, PathSet & stateReferrers) void queryStateReferrers(const Transaction & txn, const Path & storePath, PathSet & stateReferrers)
{ {
if (!isRealisablePath(txn, storePath)) if (!isRealisableComponentOrStatePath(txn, storePath))
throw Error(format("path `%1%' is not valid") % storePath); throw Error(format("path `%1%' is not valid") % storePath);
PathSet stateReferrers2 = getStateReferrers(txn, storePath); PathSet stateReferrers2 = getStateReferrers(txn, storePath);
stateReferrers.insert(stateReferrers2.begin(), stateReferrers2.end()); stateReferrers.insert(stateReferrers2.begin(), stateReferrers2.end());
@ -765,12 +769,13 @@ void clearSubstitutes()
static void setHash(const Transaction & txn, const Path & storePath, const Hash & hash, bool stateHash = false) static void setHash(const Transaction & txn, const Path & storePath, const Hash & hash, bool stateHash = false)
{ {
assert(hash.type == htSHA256); if(stateHash){
nixDB.setString(txn, dbValidStatePaths, storePath, "");
if(stateHash) }
nixDB.setString(txn, dbValidStatePaths, storePath, "sha256:" + printHash(hash)); else{
else
nixDB.setString(txn, dbValidPaths, storePath, "sha256:" + printHash(hash)); nixDB.setString(txn, dbValidPaths, storePath, "sha256:" + printHash(hash));
assert(hash.type == htSHA256);
}
} }
static void setStateHash(const Transaction & txn, const Path & storePath, const Hash & hash) static void setStateHash(const Transaction & txn, const Path & storePath, const Hash & hash)