From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Pitre Subject: [PATCH 11/23] pack v4: dictionary table output Date: Tue, 27 Aug 2013 00:25:55 -0400 Message-ID: <1377577567-27655-12-git-send-email-nico@fluxnic.net> References: <1377577567-27655-1-git-send-email-nico@fluxnic.net> Content-Transfer-Encoding: 7BIT To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Aug 27 06:27:34 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VEAsK-0007jK-FZ for gcvg-git-2@plane.gmane.org; Tue, 27 Aug 2013 06:27:28 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753183Ab3H0E1H (ORCPT ); Tue, 27 Aug 2013 00:27:07 -0400 Received: from relais.videotron.ca ([24.201.245.36]:30513 "EHLO relais.videotron.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752956Ab3H0E0c (ORCPT ); Tue, 27 Aug 2013 00:26:32 -0400 Received: from yoda.home ([70.83.209.44]) by VL-VM-MR006.ip.videotron.ca (Oracle Communications Messaging Exchange Server 7u4-22.01 64bit (built Apr 21 2011)) with ESMTP id <0MS600F6B9O5GV90@VL-VM-MR006.ip.videotron.ca> for git@vger.kernel.org; Tue, 27 Aug 2013 00:26:29 -0400 (EDT) Received: from xanadu.home (xanadu.home [192.168.2.2]) by yoda.home (Postfix) with ESMTP id 722BC2DA0669 for ; Tue, 27 Aug 2013 00:26:29 -0400 (EDT) X-Mailer: git-send-email 1.8.4.22.g54757b7 In-reply-to: <1377577567-27655-1-git-send-email-nico@fluxnic.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Here's the code to dump a table into a pack. Table entries are written according to the current sort order. This is important as objects use this order to index into the table. Signed-off-by: Nicolas Pitre --- packv4-create.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/packv4-create.c b/packv4-create.c index f46fbd9..2956fda 100644 --- a/packv4-create.c +++ b/packv4-create.c @@ -556,6 +556,55 @@ static int create_pack_dictionaries(struct packed_git *p, return 0; } +static unsigned long write_dict_table(struct sha1file *f, struct dict_table *t) +{ + unsigned char buffer[1024], *end; + unsigned hdrlen; + unsigned long size, datalen; + z_stream stream; + int i, status; + + /* + * Stored dict table format: uncompressed data length followed by + * compressed content. + */ + + datalen = t->ptr; + end = add_number(buffer, datalen); + hdrlen = end - buffer; + sha1write(f, buffer, hdrlen); + + memset(&stream, 0, sizeof(stream)); + deflateInit(&stream, pack_compression_level); + + for (i = 0; i < t->nb_entries; i++) { + stream.next_in = t->data + t->entry[i].offset; + stream.avail_in = 2 + strlen((char *)t->data + t->entry[i].offset + 2) + 1; + do { + stream.next_out = (unsigned char *)buffer; + stream.avail_out = sizeof(buffer); + status = deflate(&stream, 0); + size = stream.next_out - (unsigned char *)buffer; + sha1write(f, buffer, size); + } while (status == Z_OK); + } + do { + stream.next_out = (unsigned char *)buffer; + stream.avail_out = sizeof(buffer); + status = deflate(&stream, Z_FINISH); + size = stream.next_out - (unsigned char *)buffer; + sha1write(f, buffer, size); + } while (status == Z_OK); + if (status != Z_STREAM_END) + die("unable to deflate dictionary table (%d)", status); + if (stream.total_in != datalen) + die("dict data size mismatch (%ld vs %ld)", + stream.total_in, datalen); + deflateEnd(&stream); + + return hdrlen + datalen; +} + static struct packed_git *open_pack(const char *path) { char arg[PATH_MAX]; -- 1.8.4.22.g54757b7