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

Simplify the realisations disk cache

Browse source
This commit is contained in:
regnat 2021-05-10 17:45:53 +02:00
parent ab96c1ee50
commit d5d19582ef
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,9 +42,8 @@ create table if not exists NARs (
create table if not exists Realisations ( create table if not exists Realisations (
cache integer not null, cache integer not null,
outputId text not null, outputId text not null,
content blob, -- Json serialisation of the realisation, or empty if present is true content blob, -- Json serialisation of the realisation, or null if the realisation is absent
timestamp integer not null, timestamp integer not null,
present integer not null,
primary key (cache, outputId), primary key (cache, outputId),
foreign key (cache) references BinaryCaches(id) on delete cascade foreign key (cache) references BinaryCaches(id) on delete cascade
); );
@ -113,22 +112,22 @@ public:
state->insertRealisation.create(state->db, state->insertRealisation.create(state->db,
R"( R"(
insert or replace into Realisations(cache, outputId, content, timestamp, present) insert or replace into Realisations(cache, outputId, content, timestamp)
values (?, ?, ?, ?, 1) values (?, ?, ?, ?)
)"); )");
state->insertMissingRealisation.create(state->db, state->insertMissingRealisation.create(state->db,
R"( R"(
insert or replace into Realisations(cache, outputId, timestamp, present) insert or replace into Realisations(cache, outputId, timestamp)
values (?, ?, ?, 0) values (?, ?, ?)
)"); )");
state->queryRealisation.create(state->db, state->queryRealisation.create(state->db,
R"( R"(
select present, content from Realisations select content from Realisations
where cache = ? and outputId = ? and where cache = ? and outputId = ? and
((present = 0 and timestamp > ?) or ((content is null and timestamp > ?) or
(present = 1 and timestamp > ?)) (content is not null and timestamp > ?))
)"); )");
/* Periodically purge expired entries from the database. */ /* Periodically purge expired entries from the database. */
@ -265,12 +264,12 @@ public:
if (!queryRealisation.next()) if (!queryRealisation.next())
return {oUnknown, 0}; return {oUnknown, 0};
if (queryRealisation.getInt(0) == 0) if (queryRealisation.isNull(0))
return {oInvalid, 0}; return {oInvalid, 0};
auto realisation = auto realisation =
std::make_shared<Realisation>(Realisation::fromJSON( std::make_shared<Realisation>(Realisation::fromJSON(
nlohmann::json::parse(queryRealisation.getStr(1)), nlohmann::json::parse(queryRealisation.getStr(0)),
"Local disk cache")); "Local disk cache"));
return {oValid, realisation}; return {oValid, realisation};