[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#38408] [PATCH v16 4/6] import: crate: Memorize crate->guix-package.
From: |
Hartmut Goebel |
Subject: |
[bug#38408] [PATCH v16 4/6] import: crate: Memorize crate->guix-package. |
Date: |
Tue, 10 Nov 2020 22:39:31 +0100 |
From: Martin Becze <mjbecze@riseup.net>
This adds memorization to procedures that involve network lookups.
'lookup-crate*' is used on every dependency of a package to get its version
list. It is also used to lookup a package's metadata. 'crate-recursive-import'
is also memorized since creating the same package twice will trigger a lookup
on its dependencies.
* guix/import/crate.scm (lookup-crate*): New procedure.
(crate->guix-package): Memorize package metadata lookups.
(crate-recursive-import): Memorize package creation.
---
guix/import/crate.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/guix/import/crate.scm b/guix/import/crate.scm
index 0802ecd315..4c36a32442 100644
--- a/guix/import/crate.scm
+++ b/guix/import/crate.scm
@@ -27,6 +27,7 @@
#:use-module (guix import json)
#:use-module (guix import utils)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix memoization)
#:use-module (guix monads)
#:use-module (guix packages)
#:use-module (guix upstream)
@@ -110,6 +111,8 @@ record or #f if it was not found."
(json->crate `(,@alist
("actual_versions" . ,versions))))))))
+(define lookup-crate* (memoize lookup-crate))
+
(define (crate-version-dependencies version)
"Return the list of <crate-dependency> records of VERSION, a
<crate-version>."
@@ -215,7 +218,7 @@ latest version of CRATE-NAME."
(eq? (crate-dependency-kind dependency) 'normal)))
(define crate
- (lookup-crate crate-name))
+ (lookup-crate* crate-name))
(define version-number
(and crate
@@ -239,7 +242,7 @@ latest version of CRATE-NAME."
(define (sort-map-dependencies deps)
(sort (map (lambda (dep)
(let* ((name (crate-dependency-id dep))
- (crate (lookup-crate name))
+ (crate (lookup-crate* name))
(req (crate-dependency-requirement dep))
(ver (find-version crate req)))
(list name
@@ -268,7 +271,7 @@ latest version of CRATE-NAME."
(define* (crate-recursive-import crate-name #:key version)
(recursive-import crate-name
- #:repo->guix-package crate->guix-package
+ #:repo->guix-package (memoize crate->guix-package)
#:version version
#:guix-name crate-name->package-name))
--
2.21.3
- [bug#44560] [PATCH v16 0/6] New take on: Semantic version aware recursive importer for crates, Hartmut Goebel, 2020/11/10
- [bug#38408] [PATCH v16 4/6] import: crate: Memorize crate->guix-package.,
Hartmut Goebel <=
- [bug#38408] [PATCH v16 2/6] guix: self: Add guile-semver as a depenedency., Hartmut Goebel, 2020/11/10
- [bug#38408] [PATCH v16 6/6] import: crate: Parameterized importing of dev dependencies., Hartmut Goebel, 2020/11/10
- [bug#38408] [PATCH v16 5/6] import: utils: Trim patch version from names., Hartmut Goebel, 2020/11/10
- [bug#38408] [PATCH v16 1/6] import: utils: 'recursive-import' accepts an optional version parameter., Hartmut Goebel, 2020/11/10
- [bug#38408] [PATCH v16 3/6] import: crate: Use guile-semver to resolve module versions., Hartmut Goebel, 2020/11/10