philiptaron/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

BinaryCacheStore: Do negative caching of .narinfo lookups

Browse source
This commit is contained in:
Eelco Dolstra 2016-04-15 15:25:15 +02:00
parent d1b0909894
commit a7d8eaba54
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/libstore/binary-cache-store.cc
View file

@ -114,14 +114,22 @@ NarInfo BinaryCacheStore::readNarInfo(const Path & storePath)
auto res = state_->narInfoCache.get(storePath); auto res = state_->narInfoCache.get(storePath);
if (res) { if (res) {
stats.narInfoReadAverted++; stats.narInfoReadAverted++;
if (!*res)
throw InvalidPath(format("path ‘%s’ is not valid") % storePath);
return **res; return **res;
} }
} }
auto narInfoFile = narInfoFileFor(storePath); auto narInfoFile = narInfoFileFor(storePath);
auto data = getFile(narInfoFile); auto data = getFile(narInfoFile);
if (!data) if (!data) {
stats.narInfoMissing++;
auto state_(state.lock());
state_->narInfoCache.upsert(storePath, 0);
stats.narInfoCacheSize = state_->narInfoCache.size();
throw InvalidPath(format("path ‘%s’ is not valid") % storePath); throw InvalidPath(format("path ‘%s’ is not valid") % storePath);
}
auto narInfo = make_ref<NarInfo>(*data, narInfoFile); auto narInfo = make_ref<NarInfo>(*data, narInfoFile);
if (narInfo->path != storePath) if (narInfo->path != storePath)
throw Error(format("NAR info file for store path ‘%1%’ does not match ‘%2%’") % narInfo->path % storePath); throw Error(format("NAR info file for store path ‘%1%’ does not match ‘%2%’") % narInfo->path % storePath);
@ -149,7 +157,7 @@ bool BinaryCacheStore::isValidPath(const Path & storePath)
auto res = state_->narInfoCache.get(storePath); auto res = state_->narInfoCache.get(storePath);
if (res) { if (res) {
stats.narInfoReadAverted++; stats.narInfoReadAverted++;
return true; return *res != 0;
} }
} }

3
src/libstore/binary-cache-store.hh
View file

@ -24,7 +24,7 @@ private:
struct State struct State
{ {
LRUCache<Path, ref<NarInfo>> narInfoCache{32 * 1024}; LRUCache<Path, std::shared_ptr<NarInfo>> narInfoCache{32 * 1024};
}; };
Sync<State> state; Sync<State> state;
@ -51,6 +51,7 @@ public:
{ {
std::atomic<uint64_t> narInfoRead{0}; std::atomic<uint64_t> narInfoRead{0};
std::atomic<uint64_t> narInfoReadAverted{0}; std::atomic<uint64_t> narInfoReadAverted{0};
std::atomic<uint64_t> narInfoMissing{0};
std::atomic<uint64_t> narInfoWrite{0}; std::atomic<uint64_t> narInfoWrite{0};
std::atomic<uint64_t> narInfoCacheSize{0}; std::atomic<uint64_t> narInfoCacheSize{0};
std::atomic<uint64_t> narRead{0}; std::atomic<uint64_t> narRead{0};