nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-16 23:42:43 +01:00
Code Activity

FSAccessor: Make the fileSize and narOffset fields optional

Browse source 
The narOffset field only applies to NAR accessors. The fileSize field
may be too expensive to compute for certain accessors (e.g. libgit).
This commit is contained in:
Eelco Dolstra 2023-11-01 15:39:40 +01:00
parent 5381123879
commit 50aae0a14c
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libstore/nar-accessor.cc
View file

@ -210,10 +210,10 @@ struct NarAccessor : public FSAccessor
if (i.stat.type != Type::tRegular)
throw Error("path '%1%' inside NAR file is not a regular file", path);
if (getNarBytes) return getNarBytes(i.stat.narOffset, i.stat.fileSize);
if (getNarBytes) return getNarBytes(*i.stat.narOffset, *i.stat.fileSize);
assert(nar);
return std::string(*nar, i.stat.narOffset, i.stat.fileSize);
return std::string(*nar, *i.stat.narOffset, *i.stat.fileSize);
}
std::string readLink(const Path & path) override
@ -253,11 +253,12 @@ json listNar(ref<FSAccessor> accessor, const Path & path, bool recurse)
switch (st->type) {
case SourceAccessor::Type::tRegular:
obj["type"] = "regular";
obj["size"] = st->fileSize;
if (st->fileSize)
obj["size"] = *st->fileSize;
if (st->isExecutable)
obj["executable"] = true;
if (st->narOffset)
obj["narOffset"] = st->narOffset;
if (st->narOffset && *st->narOffset)
obj["narOffset"] = *st->narOffset;
break;
case SourceAccessor::Type::tDirectory:
obj["type"] = "directory";