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>,
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 v5 3/8] remote-odb: implement remote_odb_get_direct()
Date: Tue, 25 Sep 2018 13:53:36 +0200 [thread overview]
Message-ID: <20180925115341.19248-4-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20180925115341.19248-1-chriscool@tuxfamily.org>
From: Christian Couder <christian.couder@gmail.com>
This is implemented only in the promisor remote mode
for now by calling fetch_objects().
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
odb-helper.c | 15 +++++++++++++++
odb-helper.h | 3 +++
remote-odb.c | 17 +++++++++++++++++
remote-odb.h | 1 +
4 files changed, 36 insertions(+)
diff --git a/odb-helper.c b/odb-helper.c
index b4d403ffa9..6458fe2e32 100644
--- a/odb-helper.c
+++ b/odb-helper.c
@@ -4,6 +4,7 @@
#include "odb-helper.h"
#include "run-command.h"
#include "sha1-lookup.h"
+#include "fetch-object.h"
struct odb_helper *odb_helper_new(const char *name, int namelen)
{
@@ -14,3 +15,17 @@ struct odb_helper *odb_helper_new(const char *name, int namelen)
return o;
}
+
+int odb_helper_get_direct(struct odb_helper *o,
+ const struct object_id *oids,
+ int oid_nr)
+{
+ int res;
+ uint64_t start = getnanotime();
+
+ res = fetch_objects(o->remote, oids, oid_nr);
+
+ trace_performance_since(start, "odb_helper_get_direct");
+
+ return res;
+}
diff --git a/odb-helper.h b/odb-helper.h
index 4b792a3896..950f9f9cd1 100644
--- a/odb-helper.h
+++ b/odb-helper.h
@@ -15,5 +15,8 @@ struct odb_helper {
};
extern struct odb_helper *odb_helper_new(const char *name, int namelen);
+extern int odb_helper_get_direct(struct odb_helper *o,
+ const struct object_id *oids,
+ int oid_nr);
#endif /* ODB_HELPER_H */
diff --git a/remote-odb.c b/remote-odb.c
index 03be54ba2e..53900203ae 100644
--- a/remote-odb.c
+++ b/remote-odb.c
@@ -89,3 +89,20 @@ int has_remote_odb(void)
{
return !!find_odb_helper(NULL);
}
+
+int remote_odb_get_direct(const struct object_id *oids, int oid_nr)
+{
+ struct odb_helper *o;
+
+ trace_printf("trace: remote_odb_get_direct: nr: %d", oid_nr);
+
+ remote_odb_init();
+
+ for (o = helpers; o; o = o->next) {
+ if (odb_helper_get_direct(o, oids, oid_nr) < 0)
+ continue;
+ return 0;
+ }
+
+ return -1;
+}
diff --git a/remote-odb.h b/remote-odb.h
index 4c7b13695f..221305d1b6 100644
--- a/remote-odb.h
+++ b/remote-odb.h
@@ -3,5 +3,6 @@
extern struct odb_helper *find_odb_helper(const char *remote);
extern int has_remote_odb(void);
+extern int remote_odb_get_direct(const struct object_id *oids, int oid_nr);
#endif /* REMOTE_ODB_H */
--
2.19.0.278.gca5b891cac
next prev parent reply other threads:[~2018-09-25 11:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-25 11:53 [PATCH v5 0/8] Introducing remote ODBs Christian Couder
2018-09-25 11:53 ` [PATCH v5 1/8] fetch-object: make functions return an error code Christian Couder
2018-09-25 11:53 ` [PATCH v5 2/8] Add initial remote odb support Christian Couder
2018-09-25 11:53 ` Christian Couder [this message]
2018-09-25 11:53 ` [PATCH v5 4/8] remote-odb: add remote_odb_reinit() Christian Couder
2018-09-25 11:53 ` [PATCH v5 5/8] Use remote_odb_get_direct() and has_remote_odb() Christian Couder
2018-09-25 11:53 ` [PATCH v5 6/8] Use odb.origin.partialclonefilter instead of core.partialclonefilter Christian Couder
2018-09-25 11:53 ` [PATCH v5 7/8] t0410: test fetching from many promisor remotes Christian Couder
2018-09-28 10:35 ` SZEDER Gábor
2018-09-28 11:43 ` Christian Couder
2018-09-25 11:53 ` [PATCH v5 8/8] Documentation/config: add odb.<name>.promisorRemote Christian Couder
2018-09-25 15:02 ` Duy Nguyen
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=20180925115341.19248-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=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.
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).