wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity

HttpBinaryCacheStore: Fix caching of WantMassQuery

Browse source 
Also, test HttpBinaryCacheStore in addition to LocalBinaryCacheStore.
This commit is contained in:
Eelco Dolstra 2016-06-01 15:15:21 +02:00
parent 7850d3d279
commit cf198952d0
6 changed files with 60 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/libstore/nar-info-disk-cache.cc
View file

@ -57,6 +57,8 @@ public:
{
int id;
Path storeDir;
bool wantMassQuery;
int priority;
};
struct State
@ -126,24 +128,28 @@ public:
state->insertCache.use()(uri)(time(0))(storeDir)(wantMassQuery)(priority).exec();
assert(sqlite3_changes(state->db) == 1);
state->caches[uri] = Cache{(int) sqlite3_last_insert_rowid(state->db), storeDir};
state->caches[uri] = Cache{(int) sqlite3_last_insert_rowid(state->db), storeDir, wantMassQuery, priority};
}
bool cacheExists(const std::string & uri) override
bool cacheExists(const std::string & uri,
bool & wantMassQuery, int & priority) override
{
auto state(_state.lock());
auto i = state->caches.find(uri);
if (i != state->caches.end()) return true;
auto queryCache(state->queryCache.use()(uri));
if (queryCache.next()) {
state->caches[uri] = Cache{(int) queryCache.getInt(0), queryCache.getStr(1)};
return true;
if (i == state->caches.end()) {
auto queryCache(state->queryCache.use()(uri));
if (!queryCache.next()) return false;
state->caches.emplace(uri,
Cache{(int) queryCache.getInt(0), queryCache.getStr(1), queryCache.getInt(2), (int) queryCache.getInt(3)});
}
return false;
auto & cache(getCache(*state, uri));
wantMassQuery = cache.wantMassQuery;
priority = cache.priority;
return true;
}
std::pair<Outcome, std::shared_ptr<NarInfo>> lookupNarInfo(