From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 8A1D51F466 for ; Fri, 31 Jan 2020 18:55:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726199AbgAaSzR (ORCPT ); Fri, 31 Jan 2020 13:55:17 -0500 Received: from pb-smtp20.pobox.com ([173.228.157.52]:62777 "EHLO pb-smtp20.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725939AbgAaSzR (ORCPT ); Fri, 31 Jan 2020 13:55:17 -0500 Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id A1545ABEF9; Fri, 31 Jan 2020 13:55:09 -0500 (EST) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=drKNZW+ztv3M3gU3lsXf7kYIGCw=; b=wxG8rb 7q6hfojIzTz9stVnbInzdjD2B5VVH5iEl1gEU34APzNT2McUYS5lN/TfBra3UlFn i7egrvq/b7784l84JZ+Od1VGgg4jA2Xuwmu7D7L4qXxEohWDmxCFJRsTyJEW/4Ii y3cvu3OimtQXPx5s+m43UCC9ISOZcyWdgBgeo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=YlNXxpGopUOe1LOHr5DzaRsGww9WIDY+ Afm/pUAgbAax3lVOV4cAlCxLNVwrWEnrsCCt1B5t6vHLFRfiVl065DwRbEsO2N6b FxkGmlkxw8XifnaQfyzoNCvtdNvG4bASPJioxeNl4yA8hyG+vdqZKrI875dBd9EE MPg6BBQ5L2g= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 988EFABEF8; Fri, 31 Jan 2020 13:55:09 -0500 (EST) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.76.80.147]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id 727ABABEF4; Fri, 31 Jan 2020 13:55:06 -0500 (EST) (envelope-from junio@pobox.com) From: Junio C Hamano To: Matheus Tavares Cc: git@vger.kernel.org, Stefan Beller , =?utf-8?B?Tmd1eeG7hW4gVGjDoWkgTmfhu41j?= Duy , "brian m. carlson" , Jeff King Subject: Re: [PATCH 4/7] streaming: allow open_istream() to handle any repo References: Date: Fri, 31 Jan 2020 10:55:03 -0800 In-Reply-To: (Matheus Tavares's message of "Thu, 30 Jan 2020 17:32:20 -0300") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: 324CFBEA-445B-11EA-8F06-B0405B776F7B-77302942!pb-smtp20.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Matheus Tavares writes: > Some callers of open_istream() at archive-tar.c and archive-zip.c are > capable of working on arbitrary repositories but the repo struct is not > passed down to open_istream(), which uses the_repository internally. For > now, that's not a problem since the said callers are only being called > with the_repository. But to be consistent and avoid future problems, > let's allow open_istream() to receive a struct repository and use that > instead of the_repository. This parameter addition will also be used in > a future patch to make sha1-file.c:check_object_signature() be able to > work on arbitrary repos. > > Signed-off-by: Matheus Tavares > --- Nicely done. I am happy to see this change as the inventor of the streaming interface ;-) > archive-tar.c | 6 +++--- > archive-zip.c | 3 ++- > builtin/index-pack.c | 3 ++- > builtin/pack-objects.c | 3 ++- > sha1-file.c | 2 +- > streaming.c | 28 +++++++++++++++------------- > streaming.h | 4 +++- > 7 files changed, 28 insertions(+), 21 deletions(-) > > diff --git a/archive-tar.c b/archive-tar.c > index e16d3f756d..5a77701a15 100644 > --- a/archive-tar.c > +++ b/archive-tar.c > @@ -112,7 +112,7 @@ static void write_trailer(void) > * queues up writes, so that all our write(2) calls write exactly one > * full block; pads writes to RECORDSIZE > */ > -static int stream_blocked(const struct object_id *oid) > +static int stream_blocked(struct repository *r, const struct object_id *oid) > { > struct git_istream *st; > enum object_type type; > @@ -120,7 +120,7 @@ static int stream_blocked(const struct object_id *oid) > char buf[BLOCKSIZE]; > ssize_t readlen; > > - st = open_istream(oid, &type, &sz, NULL); > + st = open_istream(r, oid, &type, &sz, NULL); > if (!st) > return error(_("cannot stream blob %s"), oid_to_hex(oid)); > for (;;) { > @@ -324,7 +324,7 @@ static int write_tar_entry(struct archiver_args *args, > if (buffer) > write_blocked(buffer, size); > else > - err = stream_blocked(oid); > + err = stream_blocked(args->repo, oid); > } > free(buffer); > return err; > diff --git a/archive-zip.c b/archive-zip.c > index 11f5b1974b..e9f426298b 100644 > --- a/archive-zip.c > +++ b/archive-zip.c > @@ -345,7 +345,8 @@ static int write_zip_entry(struct archiver_args *args, > > if (S_ISREG(mode) && type == OBJ_BLOB && !args->convert && > size > big_file_threshold) { > - stream = open_istream(oid, &type, &size, NULL); > + stream = open_istream(args->repo, oid, &type, &size, > + NULL); > if (!stream) > return error(_("cannot stream blob %s"), > oid_to_hex(oid)); > diff --git a/builtin/index-pack.c b/builtin/index-pack.c > index 60a5591039..7a08da8401 100644 > --- a/builtin/index-pack.c > +++ b/builtin/index-pack.c > @@ -757,7 +757,8 @@ static int check_collison(struct object_entry *entry) > > memset(&data, 0, sizeof(data)); > data.entry = entry; > - data.st = open_istream(&entry->idx.oid, &type, &size, NULL); > + data.st = open_istream(the_repository, &entry->idx.oid, &type, &size, > + NULL); > if (!data.st) > return -1; > if (size != entry->size || type != entry->type) > diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c > index 393c20a2d7..ef17efd94e 100644 > --- a/builtin/pack-objects.c > +++ b/builtin/pack-objects.c > @@ -303,7 +303,8 @@ static unsigned long write_no_reuse_object(struct hashfile *f, struct object_ent > if (!usable_delta) { > if (oe_type(entry) == OBJ_BLOB && > oe_size_greater_than(&to_pack, entry, big_file_threshold) && > - (st = open_istream(&entry->idx.oid, &type, &size, NULL)) != NULL) > + (st = open_istream(the_repository, &entry->idx.oid, &type, > + &size, NULL)) != NULL) > buf = NULL; > else { > buf = read_object_file(&entry->idx.oid, &type, &size); > diff --git a/sha1-file.c b/sha1-file.c > index 03ae9ae93a..13b90b1cb1 100644 > --- a/sha1-file.c > +++ b/sha1-file.c > @@ -986,7 +986,7 @@ int check_object_signature(const struct object_id *oid, void *map, > return !oideq(oid, &real_oid) ? -1 : 0; > } > > - st = open_istream(oid, &obj_type, &size, NULL); > + st = open_istream(the_repository, oid, &obj_type, &size, NULL); > if (!st) > return -1; > > diff --git a/streaming.c b/streaming.c > index fcd6303219..800f07a52c 100644 > --- a/streaming.c > +++ b/streaming.c > @@ -16,6 +16,7 @@ enum input_source { > }; > > typedef int (*open_istream_fn)(struct git_istream *, > + struct repository *, > struct object_info *, > const struct object_id *, > enum object_type *); > @@ -29,8 +30,8 @@ struct stream_vtbl { > > #define open_method_decl(name) \ > int open_istream_ ##name \ > - (struct git_istream *st, struct object_info *oi, \ > - const struct object_id *oid, \ > + (struct git_istream *st, struct repository *r, \ > + struct object_info *oi, const struct object_id *oid, \ > enum object_type *type) > > #define close_method_decl(name) \ > @@ -108,7 +109,8 @@ ssize_t read_istream(struct git_istream *st, void *buf, size_t sz) > return st->vtbl->read(st, buf, sz); > } > > -static enum input_source istream_source(const struct object_id *oid, > +static enum input_source istream_source(struct repository *r, > + const struct object_id *oid, > enum object_type *type, > struct object_info *oi) > { > @@ -117,7 +119,7 @@ static enum input_source istream_source(const struct object_id *oid, > > oi->typep = type; > oi->sizep = &size; > - status = oid_object_info_extended(the_repository, oid, oi, 0); > + status = oid_object_info_extended(r, oid, oi, 0); > if (status < 0) > return stream_error; > > @@ -133,22 +135,23 @@ static enum input_source istream_source(const struct object_id *oid, > } > } > > -struct git_istream *open_istream(const struct object_id *oid, > +struct git_istream *open_istream(struct repository *r, > + const struct object_id *oid, > enum object_type *type, > unsigned long *size, > struct stream_filter *filter) > { > struct git_istream *st; > struct object_info oi = OBJECT_INFO_INIT; > - const struct object_id *real = lookup_replace_object(the_repository, oid); > - enum input_source src = istream_source(real, type, &oi); > + const struct object_id *real = lookup_replace_object(r, oid); > + enum input_source src = istream_source(r, real, type, &oi); > > if (src < 0) > return NULL; > > st = xmalloc(sizeof(*st)); > - if (open_istream_tbl[src](st, &oi, real, type)) { > - if (open_istream_incore(st, &oi, real, type)) { > + if (open_istream_tbl[src](st, r, &oi, real, type)) { > + if (open_istream_incore(st, r, &oi, real, type)) { > free(st); > return NULL; > } > @@ -338,8 +341,7 @@ static struct stream_vtbl loose_vtbl = { > > static open_method_decl(loose) > { > - st->u.loose.mapped = map_loose_object(the_repository, > - oid, &st->u.loose.mapsize); > + st->u.loose.mapped = map_loose_object(r, oid, &st->u.loose.mapsize); > if (!st->u.loose.mapped) > return -1; > if ((unpack_loose_header(&st->z, > @@ -499,7 +501,7 @@ static struct stream_vtbl incore_vtbl = { > > static open_method_decl(incore) > { > - st->u.incore.buf = read_object_file_extended(the_repository, oid, type, &st->size, 0); > + st->u.incore.buf = read_object_file_extended(r, oid, type, &st->size, 0); > st->u.incore.read_ptr = 0; > st->vtbl = &incore_vtbl; > > @@ -520,7 +522,7 @@ int stream_blob_to_fd(int fd, const struct object_id *oid, struct stream_filter > ssize_t kept = 0; > int result = -1; > > - st = open_istream(oid, &type, &sz, filter); > + st = open_istream(the_repository, oid, &type, &sz, filter); > if (!st) { > if (filter) > free_stream_filter(filter); > diff --git a/streaming.h b/streaming.h > index f465a3cd31..5e4e6acfd0 100644 > --- a/streaming.h > +++ b/streaming.h > @@ -8,7 +8,9 @@ > /* opaque */ > struct git_istream; > > -struct git_istream *open_istream(const struct object_id *, enum object_type *, unsigned long *, struct stream_filter *); > +struct git_istream *open_istream(struct repository *, const struct object_id *, > + enum object_type *, unsigned long *, > + struct stream_filter *); > int close_istream(struct git_istream *); > ssize_t read_istream(struct git_istream *, void *, size_t);