summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2022-12-10 10:56:48 +0100
committerLudovic Courtès <ludo@gnu.org>2022-12-10 10:56:48 +0100
commitb129026e2e242e9068158ae6e6fcd8d7c5ea092e (patch)
treeac52d64670ae247fd54c2b9550c3ff0c15a7d17c
parent591af24ade1021d91a3e7c62fcc7a8c90f00d4bb (diff)
deduplicate: Use 'sendfile' for small file copies.
* guix/store/deduplication.scm (dump-file/deduplicate): Use 'sendfile' instead of 'dump-port'. * tests/store-deduplication.scm ("copy-file/deduplicate, below %deduplication-minimum-size"): New test.
-rw-r--r--guix/store/deduplication.scm4
-rw-r--r--tests/store-deduplication.scm17
2 files changed, 18 insertions, 3 deletions
diff --git a/guix/store/deduplication.scm b/guix/store/deduplication.scm
index ab982e3b3d..9953675319 100644
--- a/guix/store/deduplication.scm
+++ b/guix/store/deduplication.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Caleb Ristvedt <caleb.ristvedt@cune.org>
-;;; Copyright © 2018-2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2018-2022 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -262,7 +262,7 @@ down the road."
(deduplicate file (dump-and-compute-hash) #:store store)
(call-with-output-file file
(lambda (output)
- (dump-port input output size)))))
+ (sendfile output input size 0)))))
(define* (copy-file/deduplicate source target
#:key (store (%store-directory)))
diff --git a/tests/store-deduplication.scm b/tests/store-deduplication.scm
index 2950fbc1a3..f1845035d8 100644
--- a/tests/store-deduplication.scm
+++ b/tests/store-deduplication.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2018, 2020-2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2018, 2020-2022 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -136,6 +136,21 @@
(cons (apply = (map (compose stat:ino stat) identical))
(map (compose stat:nlink stat) identical))))))
+(test-assert "copy-file/deduplicate, below %deduplication-minimum-size"
+ (call-with-temporary-directory
+ (lambda (store)
+ (let ((source (string-append store "/input")))
+ (call-with-output-file source
+ (lambda (port)
+ (display "Hello!\n" port)))
+ (copy-file/deduplicate source
+ (string-append store "/a")
+ #:store store)
+ (and (not (directory-exists? (string-append store "/.links")))
+ (file=? source (string-append store "/a"))
+ (not (= (stat:ino (stat (string-append store "/a")))
+ (stat:ino (stat source)))))))))
+
(test-assert "copy-file/deduplicate"
(call-with-temporary-directory
(lambda (store)