From: Christian Couder <[email protected]> This is implemented only in the promisor remote mode for now by calling fetch_objects().
Signed-off-by: Christian Couder <[email protected]> Signed-off-by: Junio C Hamano <[email protected]> --- 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
