Skip to content

BinaryCacheStore: Drop draining of input source #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edolstra merged 1 commit into from
Jun 2, 2026
Merged

BinaryCacheStore: Drop draining of input source #478

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions src/libstore/binary-cache-store.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,11 +305,8 @@ ref<const ValidPathInfo> BinaryCacheStore::addToStoreCommon(
void BinaryCacheStore::addToStore(
const ValidPathInfo & info, Source & narSource, RepairFlag repair, CheckSigsFlag checkSigs)
{
if (!repair && isValidPath(info.path)) {
// FIXME: copyNAR -> null sink
narSource.drain();
if (!repair && isValidPath(info.path))
return;
}

addToStoreCommon(narSource, repair, checkSigs, {[&](HashResult nar) {
/* FIXME reinstate these, once we can correctly do hash modulo sink as
Expand Down Expand Up @@ -425,10 +422,7 @@ void BinaryCacheStore::addMultipleToStore(
lock held by LegacySSHStore::narFromPath(). */
auto source = std::move(source_);

if (!repair && isValidPath(info.path)) {
// FIXME: copyNAR -> null sink
source->drain();
} else {
if (repair || !isValidPath(info.path)) {
MaintainCount<decltype(nrRunning)> mc(nrRunning);
showProgress();
auto narInfo = uploadData(*source, repair, [&](HashResult nar) {
Expand Down
Loading