diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-08-01 00:06:24 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-08-01 00:06:24 +0000 |
| commit | 0e9e599b00ff3cd23541ed911aa0932f4ab2cef7 (patch) | |
| tree | ab7d448612c86477a946dc0c830f5e49150eb9b1 /src/libstore/path-info.hh | |
| parent | 66834068432d316ee558717765851835ceec2dcc (diff) | |
| parent | a3f9625818ecb0c8a3c22c191340dac5a3120bb5 (diff) | |
Merge remote-tracking branch 'upstream/master' into path-info
Diffstat (limited to 'src/libstore/path-info.hh')
| -rw-r--r-- | src/libstore/path-info.hh | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/libstore/path-info.hh b/src/libstore/path-info.hh index a67c36bb6..5ebe9e8d9 100644 --- a/src/libstore/path-info.hh +++ b/src/libstore/path-info.hh @@ -26,9 +26,9 @@ struct PathReferences std::set<Ref> references; bool hasSelfReference = false; - /* Functions to view references + hasSelfReference as one set, mainly for - compatibility's sake. */ - StorePathSet referencesPossiblyToSelf(const Ref & self) const; + /* Functions to view references + hasSelfReference as one set, mainly for + compatibility's sake. */ + StorePathSet referencesPossiblyToSelf(const Ref & self) const; void insertReferencePossiblyToSelf(const Ref & self, Ref && ref); void setReferencesPossiblyToSelf(const Ref & self, std::set<Ref> && refs); }; @@ -65,7 +65,8 @@ struct ValidPathInfo : PathReferences<StorePath> { StorePath path; std::optional<StorePath> deriver; - Hash narHash; + // TODO document this + std::optional<Hash> narHash; time_t registrationTime = 0; uint64_t narSize = 0; // 0 = unknown uint64_t id; // internal use only @@ -116,9 +117,9 @@ struct ValidPathInfo : PathReferences<StorePath> /* Return true iff the path is verifiably content-addressed. */ bool isContentAddressed(const Store & store) const; - /* Functions to view references + hasSelfReference as one set, mainly for - compatibility's sake. */ - StorePathSet referencesPossiblyToSelf() const; + /* Functions to view references + hasSelfReference as one set, mainly for + compatibility's sake. */ + StorePathSet referencesPossiblyToSelf() const; void insertReferencePossiblyToSelf(StorePath && ref); void setReferencesPossiblyToSelf(StorePathSet && refs); @@ -148,8 +149,8 @@ typedef list<ValidPathInfo> ValidPathInfos; struct SubstitutablePathInfo : PathReferences<StorePath> { std::optional<StorePath> deriver; - unsigned long long downloadSize; /* 0 = unknown or inapplicable */ - unsigned long long narSize; /* 0 = unknown */ + uint64_t downloadSize; /* 0 = unknown or inapplicable */ + uint64_t narSize; /* 0 = unknown */ }; typedef std::map<StorePath, SubstitutablePathInfo> SubstitutablePathInfos; |