[RFC/PATCH v4 25/49] external-odb: add external_odb_fault_in_object()

[Christian Couder]

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org>
---
 external-odb.c | 21 ++++++++++++++++++++-
 external-odb.h |  1 +
 odb-helper.c   |  7 +++----
 odb-helper.h   |  1 +
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/external-odb.c b/external-odb.c
index 0b6e443372..502380cac2 100644
--- a/external-odb.c
+++ b/external-odb.c
@@ -113,7 +113,8 @@ int external_odb_fetch_object(const unsigned char *sha1)
                int ret;
                int fd;
 
-               if (!odb_helper_has_object(o, sha1))
+               if (o->fetch_kind != ODB_FETCH_KIND_PLAIN_OBJECT &&
+                   o->fetch_kind != ODB_FETCH_KIND_GIT_OBJECT)
                        continue;
 
                fd = create_object_tmpfile(&tmpfile, path);
@@ -139,6 +140,24 @@ int external_odb_fetch_object(const unsigned char *sha1)
        return -1;
 }
 
+int external_odb_fault_in_object(const unsigned char *sha1)
+{
+       struct odb_helper *o;
+
+       if (!external_odb_has_object(sha1))
+               return -1;
+
+       for (o = helpers; o; o = o->next) {
+               if (o->fetch_kind != ODB_FETCH_KIND_FAULT_IN)
+                       continue;
+               if (odb_helper_fault_in_object(o, sha1) < 0)
+                       continue;
+               return 0;
+       }
+
+       return -1;
+}
+
 int external_odb_for_each_object(each_external_object_fn fn, void *data)
 {
        struct odb_helper *o;
diff --git a/external-odb.h b/external-odb.h
index 53879e900d..1b46c49e25 100644
--- a/external-odb.h
+++ b/external-odb.h
@@ -4,6 +4,7 @@
 const char *external_odb_root(void);
 int external_odb_has_object(const unsigned char *sha1);
 int external_odb_fetch_object(const unsigned char *sha1);
+int external_odb_fault_in_object(const unsigned char *sha1);
 
 typedef int (*each_external_object_fn)(const unsigned char *sha1,
                                       enum object_type type,
diff --git a/odb-helper.c b/odb-helper.c
index 24dc5375cb..5fb56c6135 100644
--- a/odb-helper.c
+++ b/odb-helper.c
@@ -347,9 +347,8 @@ static int odb_helper_fetch_git_object(struct odb_helper *o,
        return 0;
 }
 
-static int odb_helper_fetch_fault_in(struct odb_helper *o,
-                                    const unsigned char *sha1,
-                                    int fd)
+int odb_helper_fault_in_object(struct odb_helper *o,
+                              const unsigned char *sha1)
 {
        struct odb_helper_object *obj;
        struct odb_helper_cmd cmd;
@@ -377,7 +376,7 @@ int odb_helper_fetch_object(struct odb_helper *o,
        case ODB_FETCH_KIND_GIT_OBJECT:
                return odb_helper_fetch_git_object(o, sha1, fd);
        case ODB_FETCH_KIND_FAULT_IN:
-               return odb_helper_fetch_fault_in(o, sha1, fd);
+               return 0;
        default:
                BUG("invalid fetch kind '%d'", o->fetch_kind);
        }
diff --git a/odb-helper.h b/odb-helper.h
index e3ad8e3316..2dc6d96c40 100644
--- a/odb-helper.h
+++ b/odb-helper.h
@@ -30,6 +30,7 @@ struct odb_helper *odb_helper_new(const char *name, int 
namelen);
 int odb_helper_has_object(struct odb_helper *o, const unsigned char *sha1);
 int odb_helper_fetch_object(struct odb_helper *o, const unsigned char *sha1,
                            int fd);
+int odb_helper_fault_in_object(struct odb_helper *o, const unsigned char 
*sha1);
 int odb_helper_for_each_object(struct odb_helper *o,
                               each_external_object_fn, void *);
 int odb_helper_write_object(struct odb_helper *o,
-- 
2.13.1.565.gbfcd7a9048