From 70a717f7a8feb15d9daf1215e305162b999b6175 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 30 Nov 2021 20:53:10 +0000
Subject: [PATCH] Nix daemon stream old wopAddToStore

No more buffering in string.
---
 src/libstore/daemon.cc | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc
index 2eb566080..773794ffc 100644
--- a/src/libstore/daemon.cc
+++ b/src/libstore/daemon.cc
@@ -431,25 +431,23 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
                 hashAlgo = parseHashType(hashAlgoRaw);
             }
 
-            StringSink saved;
-            TeeSource savedNARSource(from, saved);
-            RetrieveRegularNARSink savedRegular { saved };
+            auto dumpSource = sinkToSource([&](Sink & saved) {
+                TeeSource savedNARSource(from, saved);
+                RetrieveRegularNARSink savedRegular { saved };
 
-            if (method == FileIngestionMethod::Recursive) {
-                /* Get the entire NAR dump from the client and save it to
-                  a string so that we can pass it to
-                  addToStoreFromDump(). */
-                ParseSink sink; /* null sink; just parse the NAR */
-                parseDump(sink, savedNARSource);
-            } else
-                parseDump(savedRegular, from);
+                if (method == FileIngestionMethod::Recursive) {
+                    /* Get the entire NAR dump from the client and save it to
+                      a string so that we can pass it to
+                      addToStoreFromDump(). */
+                    ParseSink sink; /* null sink; just parse the NAR */
+                    parseDump(sink, savedNARSource);
+                } else
+                    parseDump(savedRegular, from);
 
+                if (!savedRegular.regular) throw Error("regular file expected");
+            });
             logger->startWork();
-            if (!savedRegular.regular) throw Error("regular file expected");
-
-            // FIXME: try to stream directly from `from`.
-            StringSource dumpSource { *saved.s };
-            auto path = store->addToStoreFromDump(dumpSource, baseName, method, hashAlgo);
+            auto path = store->addToStoreFromDump(*dumpSource, baseName, method, hashAlgo);
             logger->stopWork();
 
             to << store->printStorePath(path);