ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Use ServeProto::Serialise<UnkeyedValidPathInfo> for QueryValidPaths

Browse Source 
Companion to already-merged https://github.com/NixOS/nix/pull/9560
This commit is contained in:
John Ericson 2023-12-07 14:13:06 -05:00
parent 3f932a6731
commit d0d3b0a298
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/hydra-queue-runner/build-remote.cc
View File

@ -338,23 +338,10 @@ static std::map<StorePath, UnkeyedValidPathInfo> queryPathInfos(
while (true) { while (true) {
auto storePathS = readString(conn.from); auto storePathS = readString(conn.from);
if (storePathS == "") break; if (storePathS == "") break;
auto deriver = readString(conn.from); // deriver
auto references = ServeProto::Serialise<StorePathSet>::read(localStore, conn); auto storePath = localStore.parseStorePath(storePathS);
readLongLong(conn.from); // download size auto info = ServeProto::Serialise<UnkeyedValidPathInfo>::read(localStore, conn);
auto narSize = readLongLong(conn.from); infos.insert_or_assign(storePath, info);
auto narHash = Hash::parseAny(readString(conn.from), HashAlgorithm::SHA256);
auto ca = ContentAddress::parseOpt(readString(conn.from));
readStrings<StringSet>(conn.from); // sigs
ValidPathInfo info(localStore.parseStorePath(storePathS), narHash);
assert(outputs.count(info.path));
info.references = references;
info.narSize = narSize;
totalNarSize += info.narSize;
info.narHash = narHash;
info.ca = ca;
if (deriver != "")
info.deriver = localStore.parseStorePath(deriver);
infos.insert_or_assign(info.path, info);
} }
return infos; return infos;