From c1f2733dd63eb04a8a192da72835b15f9363869f Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Fri, 24 May 2024 20:45:06 -0600 Subject: libstore client: remove remaining dead code Change-Id: I1764b3878439ff7b20ff64bd4efcf03070bb0e5e --- src/libstore/remote-store.cc | 84 +++++++++++------------------------------ src/libstore/worker-protocol.cc | 21 +++++------ 2 files changed, 31 insertions(+), 74 deletions(-) diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index d445cbcb6..575078289 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -456,51 +456,21 @@ void RemoteStore::addToStore(const ValidPathInfo & info, Source & source, { auto conn(getConnection()); - if (GET_PROTOCOL_MINOR(conn->daemonVersion) < 18) { - conn->to << WorkerProto::Op::ImportPaths; - - auto source2 = sinkToSource([&](Sink & sink) { - sink << 1 // == path follows - ; + conn->to << WorkerProto::Op::AddToStoreNar + << printStorePath(info.path) + << (info.deriver ? printStorePath(*info.deriver) : "") + << info.narHash.to_string(Base16, false); + WorkerProto::write(*this, *conn, info.references); + conn->to << info.registrationTime << info.narSize + << info.ultimate << info.sigs << renderContentAddress(info.ca) + << repair << !checkSigs; + + if (GET_PROTOCOL_MINOR(conn->daemonVersion) >= 23) { + conn.withFramedSink([&](Sink & sink) { copyNAR(source, sink); - sink - << exportMagic - << printStorePath(info.path); - WorkerProto::WriteConn nested { sink, conn->daemonVersion }; - WorkerProto::write(*this, nested, info.references); - sink - << (info.deriver ? printStorePath(*info.deriver) : "") - << 0 // == no legacy signature - << 0 // == no path follows - ; }); - - conn.processStderr(0, source2.get()); - - auto importedPaths = WorkerProto::Serialise::read(*this, *conn); - assert(importedPaths.size() <= 1); - } - - else { - conn->to << WorkerProto::Op::AddToStoreNar - << printStorePath(info.path) - << (info.deriver ? printStorePath(*info.deriver) : "") - << info.narHash.to_string(Base16, false); - WorkerProto::write(*this, *conn, info.references); - conn->to << info.registrationTime << info.narSize - << info.ultimate << info.sigs << renderContentAddress(info.ca) - << repair << !checkSigs; - - if (GET_PROTOCOL_MINOR(conn->daemonVersion) >= 23) { - conn.withFramedSink([&](Sink & sink) { - copyNAR(source, sink); - }); - } else if (GET_PROTOCOL_MINOR(conn->daemonVersion) >= 21) { - conn.processStderr(0, &source); - } else { - copyNAR(source, conn->to); - conn.processStderr(0, nullptr); - } + } else { + conn.processStderr(0, &source); } } @@ -624,7 +594,6 @@ void RemoteStore::buildPaths(const std::vector & drvPaths, BuildMod auto conn(getConnection()); conn->to << WorkerProto::Op::BuildPaths; - assert(GET_PROTOCOL_MINOR(conn->daemonVersion) >= 13); WorkerProto::write(*this, *conn, drvPaths); conn->to << buildMode; conn.processStderr(); @@ -817,25 +786,14 @@ void RemoteStore::queryMissing(const std::vector & targets, StorePathSet & willBuild, StorePathSet & willSubstitute, StorePathSet & unknown, uint64_t & downloadSize, uint64_t & narSize) { - { - auto conn(getConnection()); - if (GET_PROTOCOL_MINOR(conn->daemonVersion) < 19) - // Don't hold the connection handle in the fallback case - // to prevent a deadlock. - goto fallback; - conn->to << WorkerProto::Op::QueryMissing; - WorkerProto::write(*this, *conn, targets); - conn.processStderr(); - willBuild = WorkerProto::Serialise::read(*this, *conn); - willSubstitute = WorkerProto::Serialise::read(*this, *conn); - unknown = WorkerProto::Serialise::read(*this, *conn); - conn->from >> downloadSize >> narSize; - return; - } - - fallback: - return Store::queryMissing(targets, willBuild, willSubstitute, - unknown, downloadSize, narSize); + auto conn(getConnection()); + conn->to << WorkerProto::Op::QueryMissing; + WorkerProto::write(*this, *conn, targets); + conn.processStderr(); + willBuild = WorkerProto::Serialise::read(*this, *conn); + willSubstitute = WorkerProto::Serialise::read(*this, *conn); + unknown = WorkerProto::Serialise::read(*this, *conn); + conn->from >> downloadSize >> narSize; } diff --git a/src/libstore/worker-protocol.cc b/src/libstore/worker-protocol.cc index d4954aaa8..08c5c6b70 100644 --- a/src/libstore/worker-protocol.cc +++ b/src/libstore/worker-protocol.cc @@ -165,11 +165,11 @@ UnkeyedValidPathInfo WorkerProto::Serialise::read(const St if (deriver != "") info.deriver = store.parseStorePath(deriver); info.references = WorkerProto::Serialise::read(store, conn); conn.from >> info.registrationTime >> info.narSize; - if (GET_PROTOCOL_MINOR(conn.version) >= 16) { - conn.from >> info.ultimate; - info.sigs = readStrings(conn.from); - info.ca = ContentAddress::parseOpt(readString(conn.from)); - } + + conn.from >> info.ultimate; + info.sigs = readStrings(conn.from); + info.ca = ContentAddress::parseOpt(readString(conn.from)); + return info; } @@ -180,12 +180,11 @@ void WorkerProto::Serialise::write(const Store & store, Wr << pathInfo.narHash.to_string(Base16, false); WorkerProto::write(store, conn, pathInfo.references); conn.to << pathInfo.registrationTime << pathInfo.narSize; - if (GET_PROTOCOL_MINOR(conn.version) >= 16) { - conn.to - << pathInfo.ultimate - << pathInfo.sigs - << renderContentAddress(pathInfo.ca); - } + + conn.to + << pathInfo.ultimate + << pathInfo.sigs + << renderContentAddress(pathInfo.ca); } } -- cgit v1.2.3