streaming: drop the `open()` callback function

When creating a read stream we first populate the structure with the
open callback function and then subsequently call the function. This
layout is somewhat weird though:

  - The structure needs to be allocated and partially populated with the
    open function before we can properly initialize it.

  - We only ever call the `open()` callback function right after having
    populated the `struct odb_read_stream::open` member, and it's never
    called thereafter again. So it is somewhat pointless to store the
    callback in the first place.

Especially the first point creates a problem for us. In subsequent
commits we'll want to fully move construction of the read source into
the respective object sources. E.g., the loose object source will be the
one that is responsible for creating the structure. But this creates a
problem: if we first need to create the structure so that we can call
the source-specific callback we cannot fully handle creation of the
structure in the source itself.

We could of course work around that and have the loose object source
create the structure and populate its `open()` callback, only. But
this doesn't really buy us anything due to the second bullet point
above.

Instead, drop the callback entirely and refactor `istream_source()` so
that we open the streams immediately. This unblocks a subsequent step,
where we'll also start to allocate the structure in the source-specific
logic.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/streaming.c b/streaming.c
index 1fb4b7c1c002e87c08e68e161d9d448d4ee0b31f..1bb3f393b875190b672da5fe57373ef44afa062b 100644 (file)
--- a/streaming.c
+++ b/streaming.c
@@ -14,10 +14,6 @@
 #include "replace-object.h"
 #include "packfile.h"
 
-typedef int (*open_istream_fn)(struct odb_read_stream *,
-                              struct repository *,
-                              const struct object_id *,
-                              enum object_type *);
 typedef int (*close_istream_fn)(struct odb_read_stream *);
 typedef ssize_t (*read_istream_fn)(struct odb_read_stream *, char *, size_t);
 
@@ -34,7 +30,6 @@ struct filtered_istream {
 };
 
 struct odb_read_stream {
-       open_istream_fn open;
        close_istream_fn close;
        read_istream_fn read;
 
@@ -437,21 +432,25 @@ static int istream_source(struct odb_read_stream *st,
 
        switch (oi.whence) {
        case OI_LOOSE:
-               st->open = open_istream_loose;
+               if (open_istream_loose(st, r, oid, type) < 0)
+                       break;
                return 0;
        case OI_PACKED:
-               if (!oi.u.packed.is_delta &&
-                   repo_settings_get_big_file_threshold(the_repository) < size) {
-                       st->u.in_pack.pack = oi.u.packed.pack;
-                       st->u.in_pack.pos = oi.u.packed.offset;
-                       st->open = open_istream_pack_non_delta;
-                       return 0;
-               }
-               /* fallthru */
-       default:
-               st->open = open_istream_incore;
+               if (oi.u.packed.is_delta ||
+                   repo_settings_get_big_file_threshold(the_repository) >= size)
+                       break;
+
+               st->u.in_pack.pack = oi.u.packed.pack;
+               st->u.in_pack.pos = oi.u.packed.offset;
+               if (open_istream_pack_non_delta(st, r, oid, type) < 0)
+                       break;
+
                return 0;
+       default:
+               break;
        }
+
+       return open_istream_incore(st, r, oid, type);
 }
 
 /****************************************************************
@@ -485,12 +484,6 @@ struct odb_read_stream *open_istream(struct repository *r,
                return NULL;
        }
 
-       if (st->open(st, r, real, type)) {
-               if (open_istream_incore(st, r, real, type)) {
-                       free(st);
-                       return NULL;
-               }
-       }
        if (filter) {
                /* Add "&& !is_null_stream_filter(filter)" for performance */
                struct odb_read_stream *nst = attach_stream_filter(st, filter);