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>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Ramsay Jones" <ramsay@ramsayjones.plus.com>,
"Derrick Stolee" <stolee@gmail.com>,
"Christian Couder" <christian.couder@gmail.com>
Subject: [PATCH v6 04/15] promisor-remote: implement promisor_remote_get_direct()
Date: Tue, 25 Jun 2019 15:40:28 +0200 [thread overview]
Message-ID: <20190625134039.21707-5-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20190625134039.21707-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.
Helped-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Helped-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
promisor-remote.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++
promisor-remote.h | 5 ++++
2 files changed, 72 insertions(+)
diff --git a/promisor-remote.c b/promisor-remote.c
index c249b80e02..b79a84ce3a 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,68 @@ int has_promisor_remote(void)
{
return !!promisor_remote_find(NULL);
}
+
+static int remove_fetched_oids(struct repository *repo,
+ struct object_id **oids,
+ int oid_nr, int to_free)
+{
+ int i, remaining_nr = 0;
+ int *remaining = xcalloc(oid_nr, sizeof(*remaining));
+ struct object_id *old_oids = *oids;
+ struct object_id *new_oids;
+
+ for (i = 0; i < oid_nr; i++)
+ if (oid_object_info_extended(repo, &old_oids[i], NULL,
+ OBJECT_INFO_SKIP_FETCH_OBJECT)) {
+ remaining[i] = 1;
+ remaining_nr++;
+ }
+
+ if (remaining_nr) {
+ int j = 0;
+ new_oids = xcalloc(remaining_nr, sizeof(*new_oids));
+ for (i = 0; i < oid_nr; i++)
+ if (remaining[i])
+ oidcpy(&new_oids[j++], &old_oids[i]);
+ *oids = new_oids;
+ if (to_free)
+ free(old_oids);
+ }
+
+ free(remaining);
+
+ return remaining_nr;
+}
+
+int promisor_remote_get_direct(struct repository *repo,
+ const struct object_id *oids,
+ int oid_nr)
+{
+ struct promisor_remote *r;
+ struct object_id *remaining_oids = (struct object_id *)oids;
+ int remaining_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, remaining_oids, remaining_nr) < 0) {
+ if (remaining_nr == 1)
+ continue;
+ remaining_nr = remove_fetched_oids(repo, &remaining_oids,
+ remaining_nr, to_free);
+ if (remaining_nr) {
+ to_free = 1;
+ continue;
+ }
+ }
+ res = 0;
+ break;
+ }
+
+ if (to_free)
+ free(remaining_oids);
+
+ return res;
+}
diff --git a/promisor-remote.h b/promisor-remote.h
index 01dcdf4dc7..ed4ecead36 100644
--- a/promisor-remote.h
+++ b/promisor-remote.h
@@ -1,6 +1,8 @@
#ifndef PROMISOR_REMOTE_H
#define PROMISOR_REMOTE_H
+struct object_id;
+
/*
* Promisor remote linked list
* Its information come from remote.XXX config entries.
@@ -12,5 +14,8 @@ 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(struct repository *repo,
+ const struct object_id *oids,
+ int oid_nr);
#endif /* PROMISOR_REMOTE_H */
--
2.22.0.229.ga13d9ffdf7.dirty
next prev parent reply other threads:[~2019-06-25 13:41 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-25 13:40 [PATCH v6 00/15] Many promisor remotes Christian Couder
2019-06-25 13:40 ` [PATCH v6 01/15] t0410: remove pipes after git commands Christian Couder
2019-06-25 13:40 ` [PATCH v6 02/15] fetch-object: make functions return an error code Christian Couder
2019-06-25 13:40 ` [PATCH v6 03/15] Add initial support for many promisor remotes Christian Couder
2019-06-25 13:40 ` Christian Couder [this message]
2019-06-25 13:40 ` [PATCH v6 05/15] promisor-remote: add promisor_remote_reinit() Christian Couder
2019-06-25 13:40 ` [PATCH v6 06/15] promisor-remote: use repository_format_partial_clone Christian Couder
2019-06-25 13:40 ` [PATCH v6 07/15] Use promisor_remote_get_direct() and has_promisor_remote() Christian Couder
2019-06-25 13:40 ` [PATCH v6 08/15] promisor-remote: parse remote.*.partialclonefilter Christian Couder
2019-06-25 13:40 ` [PATCH v6 09/15] builtin/fetch: remove unique promisor remote limitation Christian Couder
2019-06-25 13:40 ` [PATCH v6 10/15] t0410: test fetching from many promisor remotes Christian Couder
2019-06-25 13:40 ` [PATCH v6 11/15] partial-clone: add multiple remotes in the doc Christian Couder
2019-06-25 13:40 ` [PATCH v6 12/15] remote: add promisor and partial clone config to " Christian Couder
2019-06-25 13:40 ` [PATCH v6 13/15] Remove fetch-object.{c,h} in favor of promisor-remote.{c,h} Christian Couder
2019-06-25 13:40 ` [PATCH v6 14/15] Move repository_format_partial_clone to promisor-remote.c Christian Couder
2019-06-25 13:40 ` [PATCH v6 15/15] Move core_partial_clone_filter_default " Christian Couder
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190625134039.21707-5-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=ramsay@ramsayjones.plus.com \
--cc=stolee@gmail.com \
--cc=sunshine@sunshineco.com \
--cc=szeder.dev@gmail.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.
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 NNTP newsgroup(s).