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

Fix assertion failure in NarInfoDiskCache

Browse source 
https://hydra.nixos.org/build/85827920
This commit is contained in:
Eelco Dolstra 2018-12-12 17:12:41 +01:00
parent 03ce0c3a9e
commit f7425d55df
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -101,7 +101,7 @@ public:
"insert or replace into NARs(cache, hashPart, timestamp, present) values (?, ?, ?, 0)"); "insert or replace into NARs(cache, hashPart, timestamp, present) values (?, ?, ?, 0)");
state->queryNAR.create(state->db, state->queryNAR.create(state->db,
"select * from NARs where cache = ? and hashPart = ? and ((present = 0 and timestamp > ?) or (present = 1 and timestamp > ?))"); "select present, namePart, url, compression, fileHash, fileSize, narHash, narSize, refs, deriver, sigs, ca from NARs where cache = ? and hashPart = ? and ((present = 0 and timestamp > ?) or (present = 1 and timestamp > ?))");
/* Periodically purge expired entries from the database. */ /* Periodically purge expired entries from the database. */
retrySQLite<void>([&]() { retrySQLite<void>([&]() {
@ -190,28 +190,28 @@ public:
if (!queryNAR.next()) if (!queryNAR.next())
return {oUnknown, 0}; return {oUnknown, 0};
if (!queryNAR.getInt(13)) if (!queryNAR.getInt(0))
return {oInvalid, 0}; return {oInvalid, 0};
auto narInfo = make_ref<NarInfo>(); auto narInfo = make_ref<NarInfo>();
auto namePart = queryNAR.getStr(2); auto namePart = queryNAR.getStr(1);
narInfo->path = cache.storeDir + "/" + narInfo->path = cache.storeDir + "/" +
hashPart + (namePart.empty() ? "" : "-" + namePart); hashPart + (namePart.empty() ? "" : "-" + namePart);
narInfo->url = queryNAR.getStr(3); narInfo->url = queryNAR.getStr(2);
narInfo->compression = queryNAR.getStr(4); narInfo->compression = queryNAR.getStr(3);
if (!queryNAR.isNull(5)) if (!queryNAR.isNull(4))
narInfo->fileHash = Hash(queryNAR.getStr(5)); narInfo->fileHash = Hash(queryNAR.getStr(4));
narInfo->fileSize = queryNAR.getInt(6); narInfo->fileSize = queryNAR.getInt(5);
narInfo->narHash = Hash(queryNAR.getStr(7)); narInfo->narHash = Hash(queryNAR.getStr(6));
narInfo->narSize = queryNAR.getInt(8); narInfo->narSize = queryNAR.getInt(7);
for (auto & r : tokenizeString<Strings>(queryNAR.getStr(9), " ")) for (auto & r : tokenizeString<Strings>(queryNAR.getStr(8), " "))
narInfo->references.insert(cache.storeDir + "/" + r); narInfo->references.insert(cache.storeDir + "/" + r);
if (!queryNAR.isNull(10)) if (!queryNAR.isNull(9))
narInfo->deriver = cache.storeDir + "/" + queryNAR.getStr(10); narInfo->deriver = cache.storeDir + "/" + queryNAR.getStr(9);
for (auto & sig : tokenizeString<Strings>(queryNAR.getStr(11), " ")) for (auto & sig : tokenizeString<Strings>(queryNAR.getStr(10), " "))
narInfo->sigs.insert(sig); narInfo->sigs.insert(sig);
narInfo->ca = queryNAR.getStr(12); narInfo->ca = queryNAR.getStr(11);
return {oValid, narInfo}; return {oValid, narInfo};
}); });