From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Ben Peart <Ben.Peart@microsoft.com>,
Jonathan Tan <jonathantanmy@google.com>,
Jonathan Nieder <jrnieder@gmail.com>,
Nguyen Thai Ngoc Duy <pclouds@gmail.com>,
Mike Hommey <mh@glandium.org>,
Lars Schneider <larsxschneider@gmail.com>,
Eric Wong <e@80x24.org>,
Christian Couder <chriscool@tuxfamily.org>,
Jeff Hostetler <jeffhost@microsoft.com>,
Eric Sunshine <sunshine@sunshineco.com>,
Beat Bolli <dev+git@drbeat.li>,
Christian Couder <christian.couder@gmail.com>
Subject: [PATCH v4 03/11] promisor-remote: implement promisor_remote_get_direct()
Date: Mon, 1 Apr 2019 18:40:37 +0200 [thread overview]
Message-ID: <20190401164045.17328-4-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20190401164045.17328-1-chriscool@tuxfamily.org>
From: Christian Couder <christian.couder@gmail.com>
This is implemented for now by calling fetch_objects(). It fetches
from all the promisor remotes.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
promisor-remote.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++
promisor-remote.h | 1 +
2 files changed, 65 insertions(+)
diff --git a/promisor-remote.c b/promisor-remote.c
index 0c768210ee..a3d601e45a 100644
--- a/promisor-remote.c
+++ b/promisor-remote.c
@@ -1,6 +1,8 @@
#include "cache.h"
+#include "object-store.h"
#include "promisor-remote.h"
#include "config.h"
+#include "fetch-object.h"
static struct promisor_remote *promisors;
static struct promisor_remote **promisors_tail = &promisors;
@@ -90,3 +92,65 @@ int has_promisor_remote(void)
{
return !!promisor_remote_find(NULL);
}
+
+static int remove_fetched_oids(struct object_id **oids, int oid_nr, int to_free)
+{
+ int i, missing_nr = 0;
+ int *missing = xcalloc(oid_nr, sizeof(*missing));
+ struct object_id *old_oids = *oids;
+ struct object_id *new_oids;
+ int old_fetch_if_missing = fetch_if_missing;
+
+ fetch_if_missing = 0;
+
+ for (i = 0; i < oid_nr; i++)
+ if (oid_object_info_extended(the_repository, &old_oids[i], NULL, 0)) {
+ missing[i] = 1;
+ missing_nr++;
+ }
+
+ fetch_if_missing = old_fetch_if_missing;
+
+ if (missing_nr) {
+ int j = 0;
+ new_oids = xcalloc(missing_nr, sizeof(*new_oids));
+ for (i = 0; i < oid_nr; i++)
+ if (missing[i])
+ oidcpy(&new_oids[j++], &old_oids[i]);
+ *oids = new_oids;
+ if (to_free)
+ free(old_oids);
+ }
+
+ return missing_nr;
+}
+
+int promisor_remote_get_direct(const struct object_id *oids, int oid_nr)
+{
+ struct promisor_remote *r;
+ struct object_id *missing_oids = (struct object_id *)oids;
+ int missing_nr = oid_nr;
+ int to_free = 0;
+ int res = -1;
+
+ promisor_remote_init();
+
+ for (r = promisors; r; r = r->next) {
+ if (fetch_objects(r->name, missing_oids, missing_nr) < 0) {
+ if (missing_nr == 1)
+ continue;
+ missing_nr = remove_fetched_oids(&missing_oids, missing_nr, to_free);
+ if (missing_nr) {
+ to_free = 1;
+ continue;
+ }
+ }
+ res = 0;
+ break;
+ }
+
+ if (to_free)
+ free(missing_oids);
+
+ return res;
+}
diff --git a/promisor-remote.h b/promisor-remote.h
index 01dcdf4dc7..30c0b3dcb6 100644
--- a/promisor-remote.h
+++ b/promisor-remote.h
@@ -12,5 +12,6 @@ struct promisor_remote {
extern struct promisor_remote *promisor_remote_find(const char *remote_name);
extern int has_promisor_remote(void);
+extern int promisor_remote_get_direct(const struct object_id *oids, int oid_nr);
#endif /* PROMISOR_REMOTE_H */
--
2.21.0.203.gd44fa53258
next prev parent reply other threads:[~2019-04-01 16:41 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-01 16:40 [PATCH v4 00/11] Many promisor remotes Christian Couder
2019-04-01 16:40 ` [PATCH v4 01/11] fetch-object: make functions return an error code Christian Couder
2019-04-01 16:40 ` [PATCH v4 02/11] Add initial support for many promisor remotes Christian Couder
2019-04-03 22:08 ` SZEDER Gábor
2019-04-04 8:02 ` Christian Couder
2019-04-01 16:40 ` Christian Couder [this message]
2019-04-01 16:40 ` [PATCH v4 04/11] promisor-remote: add promisor_remote_reinit() Christian Couder
2019-04-01 16:40 ` [PATCH v4 05/11] promisor-remote: use repository_format_partial_clone Christian Couder
2019-04-01 16:40 ` [PATCH v4 06/11] Use promisor_remote_get_direct() and has_promisor_remote() Christian Couder
2019-04-01 16:40 ` [PATCH v4 07/11] promisor-remote: parse remote.*.partialclonefilter Christian Couder
2019-04-01 16:40 ` [PATCH v4 08/11] builtin/fetch: remove unique promisor remote limitation Christian Couder
2019-04-01 16:40 ` [PATCH v4 09/11] t0410: test fetching from many promisor remotes Christian Couder
2019-04-05 0:56 ` SZEDER Gábor
2019-04-01 16:40 ` [PATCH v4 10/11] partial-clone: add multiple remotes in the doc Christian Couder
2019-04-01 16:40 ` [PATCH v4 11/11] remote: add promisor and partial clone config to " Christian Couder
2019-04-04 7:23 ` [PATCH v4 00/11] Many promisor remotes Junio C Hamano
2019-04-04 7:59 ` Christian Couder
2019-04-05 20:07 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190401164045.17328-4-chriscool@tuxfamily.org \
--to=christian.couder@gmail.com \
--cc=Ben.Peart@microsoft.com \
--cc=chriscool@tuxfamily.org \
--cc=dev+git@drbeat.li \
--cc=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jeffhost@microsoft.com \
--cc=jonathantanmy@google.com \
--cc=jrnieder@gmail.com \
--cc=larsxschneider@gmail.com \
--cc=mh@glandium.org \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).