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

Merge pull request #14643 from NixOS/binary-cache-nar-from-path

Browse source 
BinaryCacheStore::narFromPath(): Fix unreachable code
This commit is contained in:
Eelco Dolstra 2025-11-26 09:53:23 +00:00 • committed by GitHub
commit 2e262c6685
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 28 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -418,10 +418,20 @@ void BinaryCacheStore::narFromPath(const StorePath & storePath, Sink & sink)
{ {
auto info = queryPathInfo(storePath).cast<const NarInfo>(); auto info = queryPathInfo(storePath).cast<const NarInfo>();
LengthSink narSize; uint64_t narSize = 0;
TeeSink tee{sink, narSize};
auto decompressor = makeDecompressionSink(info->compression, tee); LambdaSink uncompressedSink{
[&](std::string_view data) {
narSize += data.size();
sink(data);
},
[&]() {
stats.narRead++;
// stats.narReadCompressedBytes += nar->size(); // FIXME
stats.narReadBytes += narSize;
}};
auto decompressor = makeDecompressionSink(info->compression, uncompressedSink);
try { try {
getFile(info->url, *decompressor); getFile(info->url, *decompressor);
@ -431,9 +441,7 @@ void BinaryCacheStore::narFromPath(const StorePath & storePath, Sink & sink)
decompressor->finish(); decompressor->finish();
stats.narRead++; // Note: don't do anything here because it's never reached if we're called as a coroutine.
// stats.narReadCompressedBytes += nar->size(); // FIXME
stats.narReadBytes += narSize.length;
} }
void BinaryCacheStore::queryPathInfoUncached( void BinaryCacheStore::queryPathInfoUncached(

19
src/libutil/include/nix/util/serialise.hh
View file

@ -447,18 +447,27 @@ struct LengthSource : Source
*/ */
struct LambdaSink : Sink struct LambdaSink : Sink
{ {
typedef std::function<void(std::string_view data)> lambda_t; typedef std::function<void(std::string_view data)> data_t;
typedef std::function<void()> cleanup_t;
lambda_t lambda; data_t dataFun;
cleanup_t cleanupFun;
LambdaSink(const lambda_t & lambda) LambdaSink(
: lambda(lambda) const data_t & dataFun, const cleanup_t & cleanupFun = []() {})
: dataFun(dataFun)
, cleanupFun(cleanupFun)
{ {
} }
~LambdaSink()
{
cleanupFun();
}
void operator()(std::string_view data) override void operator()(std::string_view data) override
{ {
lambda(data); dataFun(data);
} }
}; };