From 2718c29c3fb9f9de2ec897248ad49ae11ca39b7a Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 10 Dec 2020 11:21:14 +0100
Subject: nar: Deduplicate files right as they are restored.

This avoids having to traverse and re-read the files that we have just
restored, thereby reducing I/O.

* guix/serialization.scm (dump-file): New procedure.
(restore-file): Add #:dump-file parameter and honor it.
* guix/store/deduplication.scm (tee, dump-file/deduplicate): New
procedures.
* guix/nar.scm (restore-one-item): Pass #:dump-file to 'restore-file'.
(finalize-store-file): Pass #:deduplicate? #f to 'register-items'.
* tests/nar.scm <top level>: Call 'setenv' to set "NIX_STORE".
---
 tests/nar.scm | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tests')

diff --git a/tests/nar.scm b/tests/nar.scm
index 59616659c8..ba4881caaa 100644
--- a/tests/nar.scm
+++ b/tests/nar.scm
@@ -452,6 +452,9 @@
         (false-if-exception (rm-rf %test-dir))
         (setlocale LC_ALL locale)))))
 
+;; XXX: Tell the 'deduplicate' procedure what store we're actually using.
+(setenv "NIX_STORE" (%store-prefix))
+
 (test-assert "restore-file-set (signed, valid)"
   (with-store store
     (let* ((texts (unfold (cut >= <> 10)
-- 
cgit v1.2.3

07e618d49920d8c'>refs</a><a class='active' href='/guix/log/tests/ed25519.key'>log</a><a href='/guix/tree/tests/ed25519.key?id=6bf70cc8e7b8c592bb0feb67807e618d49920d8c'>tree</a><a href='/guix/commit/tests/ed25519.key?id=6bf70cc8e7b8c592bb0feb67807e618d49920d8c'>commit</a><a href='/guix/diff/tests/ed25519.key?id=6bf70cc8e7b8c592bb0feb67807e618d49920d8c'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/ed25519.key'>
<input type='hidden' name='id' value='6bf70cc8e7b8c592bb0feb67807e618d49920d8c'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=6bf70cc8e7b8c592bb0feb67807e618d49920d8c'>root</a>/<a href='/guix/log/tests?id=6bf70cc8e7b8c592bb0feb67807e618d49920d8c'>tests</a>/<a href='/guix/log/tests/ed25519.key?id=6bf70cc8e7b8c592bb0feb67807e618d49920d8c'>ed25519.key</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/ed25519.key?id=6bf70cc8e7b8c592bb0feb67807e618d49920d8c&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-05-04 09:56:12 +0200'>2020-05-04</span></td><td><a href='/guix/commit/tests/ed25519.key?id=43408e304ffb1149f35cb539b40d673d567c9116'>Add (guix openpgp).</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>