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

Nix daemon stream old wopAddToStore

Browse source 
No more buffering in string.
This commit is contained in:
John Ericson 2021-11-30 20:53:10 +00:00
parent 1a9bfdc4ca
commit 70a717f7a8
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libstore/daemon.cc
View file

@ -431,7 +431,7 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
hashAlgo = parseHashType(hashAlgoRaw); hashAlgo = parseHashType(hashAlgoRaw);
} }
StringSink saved; auto dumpSource = sinkToSource([&](Sink & saved) {
TeeSource savedNARSource(from, saved); TeeSource savedNARSource(from, saved);
RetrieveRegularNARSink savedRegular { saved }; RetrieveRegularNARSink savedRegular { saved };
@ -444,12 +444,10 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
} else } else
parseDump(savedRegular, from); parseDump(savedRegular, from);
logger->startWork();
if (!savedRegular.regular) throw Error("regular file expected"); if (!savedRegular.regular) throw Error("regular file expected");
});
// FIXME: try to stream directly from `from`. logger->startWork();
StringSource dumpSource { *saved.s }; auto path = store->addToStoreFromDump(*dumpSource, baseName, method, hashAlgo);
auto path = store->addToStoreFromDump(dumpSource, baseName, method, hashAlgo);
logger->stopWork(); logger->stopWork();
to << store->printStorePath(path); to << store->printStorePath(path);