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

Avoid a redundant hash

Browse source
This commit is contained in:
Eelco Dolstra 2020-07-10 15:56:24 +02:00
parent 5dff49f661
commit 8efa23bb99
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/store-api.cc
View file

@ -229,14 +229,17 @@ ValidPathInfo Store::addToStoreSlow(std::string_view name, const Path & srcPath,
/* FIXME: inefficient: we're reading/hashing 'tmpFile' three /* FIXME: inefficient: we're reading/hashing 'tmpFile' three
times. */ times. */
auto [narHash, narSize] = hashPath(htSHA256, srcPath);
auto hash = method == FileIngestionMethod::Recursive auto hash = method == FileIngestionMethod::Recursive
? hashPath(hashAlgo, srcPath).first ? hashAlgo == htSHA256
? narHash
: hashPath(hashAlgo, srcPath).first
: hashFile(hashAlgo, srcPath); : hashFile(hashAlgo, srcPath);
if (expectedCAHash && expectedCAHash != hash) if (expectedCAHash && expectedCAHash != hash)
throw Error("hash mismatch for '%s'", srcPath); throw Error("hash mismatch for '%s'", srcPath);
auto [narHash, narSize] = hashPath(htSHA256, srcPath);
ValidPathInfo info(makeFixedOutputPath(method, hash, name)); ValidPathInfo info(makeFixedOutputPath(method, hash, name));
info.narHash = narHash; info.narHash = narHash;
info.narSize = narSize; info.narSize = narSize;